fixes in c-form