tbf: event handling fixes