Fixes for events
Fixes for events