Analytics fixes