more SFS fixes