New VFS + misc changes