Fixed some bugs on the tracker