Fix some analytics tags