Clean up build system a little bit