Fixup enter/leave events