Improve the build