Improve build tools