Some CADRE fixes