Small fixes and housekeeping in build files