Changes to build process