Fixes on fstab entry detection and dir name