more CCS field fixes