further cc form fixes