Key event fixes (Removed unused patch)