More fixes to build against new updated es2 build.