Some cleanups in the build configuration.