Continued bugfixing.