tweaks in umount function