Fixup event handling again