Small changes in AnalyzerService.