Unmount fixes.