Fixes to event list