Bug fixes to copy mode KeepAll