fstools: backport fixes from master branch