CONTRIB-5298 :: Small bugs in new events system

Signed-off-by: Joseph Rézeau <moodle@rezeau.org>