Code analysis changes