More event fixes.
Merge pull request #240 from ZomgPonies/master

More event fixes.