fixing up the build system