Minor updates to copying functionality