More fixes to the build system.