Fixed some bugs occuring when the tracking graph is too simple