Fix E+ runtime errors

Fixes various errors in E+ found during integration testing.