IDEX-980
IDEX-980: fix compilation after changes in vfs api, make some improvements