More event fixes.