bug fixes for keybindings