Fix up output xml more, make sure events are not dropped.