Continued bugfixing