various FS fixes and refactoring to reduce incidence of NaN errors

Merge request reports

Loading