Fix GA events, take 4