Fixing clean build problems