Fix event keys