Minor improvement to build process