More fixing event bugs.