Added some mappings for pasting issues