Tracker bugs fixed