minor improvements on Analytics