Some fixes to key bindings.