Analyzers Fix