Fixes for events