TX: Event fixes