Fix unload events (addEvent doesnt return)