Fix FS parsing and fix #436
Fix #442 (incorrect root directory detection)