Some more bugfixing.