Various CID fixes