Event tracker fixes