Code Analysis related changes