CodeAnalysis fixes.