Fixes to filesystem mode