Minor improvements to the build