Fixup multiple event attaches on waypoints