Fix key handlers