Fixes for event management