Fix some keybindings in vi mode