Minor mods for TOffice data issues.