more fixes for c and c