minor fixes and mock file system