Fix tracker routes