Updates to allow clean build