fixes for different type of events