Fix unmount issues