more changes for builds to work from clean