fixup build system