Improvements to the build and the data loader.