Some changes on key bindings