Fix event structs errors