Fixed a couple of event related issues.

These issues showed up in compilation after a fix was make in esdl.