TX: Fix up events