Bugfixing before the release