Minor updates to the build system.