Compilation fixes in cfs.c