Fixed Move and Copy

Not sure if @ZAM- needs to sign of on this but here it is.