Minor fixes; Analytics