Add missing CR_C define
Update errors