key bindings fixes