small tweaks
Merge branch 'eventchannel-tweaks'