Improve build process somewhat