Fix C generator issues but some more were introduced ...