tracker fixes