Fixed tracker bugs