Minor updates to build process