A bit more bugfixing.