Bugfixes, test build