Event formatting fixes --