Fixing some bad references on the keystroke handling.