Merge pull request #1434 from ellensi/DSOffice

Quick fixes for DSOffice