Fix GA tracking code
Minor tweaks