Fixup in the build system