[vim keymap] Minor fixes