Fix tracking issues in Firefox