next round of fixes for BoostIO branch

Please merge into 7.1.boostio branch.