Basic changes to the build system