Fix CodeAnalysis