Fixes to build files