Fix more instances from tracker