First round of fixes for new Filesystem