Code Analyze fixes

Code Analyze fixes