Add fixes for NewE2 implementation