Further key binding fixes