Analytics: some more fixes