More copy fixes