Small build process updates