More bugfixes for events