Fix some issues reported by mago#856

DanielBadura wants to merge 1 commit into

3.20.xpatchlevel/event-sourcing:3.20.xfrom

some-fixes-from-magopatchlevel/event-sourcing:some-fixes-from-magoCopy head branch name to clipboard