Tweaking the build system