Reset UniqueTracker; fix new project issue