Ga event tracking fixes