Fixes to the fs usages in stlib