more fixes of the new events model