VFS improvements