Another set of small fixes for event module