1.1-dev: minor changes to the eventhandler