Fix some bugs in FS fallback