Copy fixes to 2 stage updating to master