Build files, Bugfixes