Fix event tracking, maybe.