Some fixes to the build configuration.