Fixed some bugs I missed with handling cancelled unloading