Build file bugfixes