Last tracker fixes