Fix event tracking calls