Code Analysis Changes

Code Analysis Changes