Again Bugfixes, should solve build problems