Add fixes for NewE2 implementation

No match.