combined with the (broken?) versions of these files provided with the fdesc mount. fixes PR#774 & PR#957.