some fixes for the event interface