Analyzer fixes.