Fix last bugs in TrackerByFeatures