Resolve drift and tracking issues.