Fix cut and copy issues