Bugfixing during release-testing.