Fix event tracking.