small fixes for events