Changed how unload works so it doesn't return before completing the unload.