Also no donkeys
Fix unmount logic