View Filesystem fixes 2