Fixed issues with the Eventor setup.

All 663u, 339i tests pass.