Fixes for `fs` wrapper