Some Code Analysis updates