Cleanup and copy tweaks