Polish the build system a tad