Trying to commit hotkey fixes