Fixups in the build system