fixes in cform