Analyzer fixes