fixes for events