Analytics code minor update