pull in \C fixes