Further keybinding fixes, plus helm