Some fiddling in the event module