fixed a few e2c imposed issues