Fixes to events