Event fixes

Event fixes