VFS & Warning fixing