Improve build files