Improvements to build