Clipboard handling improved