Minor fixup of the build system