Code Analysis changes