Few fixes about umount()-ing