Keycodes fixed