Shortcut key tweaks