Improvements to copy/pasting [OSX]