[DT] A couple of fixes discussed earlier with @apipkin and @lsmith

Update from Pull Request #946. Should be good to go based on @lsmith's comments, but I wanted to do a fresh pull request for tracking purposes.

- [x] Test (No tests needed for document changes)
- [x] Code Fix
- [x] History 
- [x] Sign Off or 3 days