Little bug fixes in the build files