fixes for event state manager