Add fixes to NewE2 c-codes