copy tweaks (bug 960338)