Fix ananlytics upstream