Minor changes to build process