Minor fixes to ServicePerfLogAnalyzer
Merged with latest.