Minor fixes
Interaction: Support key events