Fixes to the build file