more SFS fixes
more SFS fixes