Fixing some keybindings