Fixed a clean copy build issues