FLEECE-8 various enhancements from Hendrik Saly, thanks a lot.