Improve minimal FS management on shell