Minor keymap adjustments