Fixes to events manager