Fixing hotkeys