Bugfixing to get a clean build