More hotkeys and compose fix