Fix to build process