Minor StateStore <-> EventsManager adjustment
#313
Merged
StateStore <-> EventsManager adjustment
#313