Fix some CID "dereference NULL_RETURNS" issues