Fix up event tracking