Fix Analyzer errors
Fix Analyzer Errors