Minor fixes to single event API