Fixes from the testing of DBS3 upload.
Merge pull request #4391 from sfoulkes/dbs3_fixes

Fixes from the testing of DBS3 upload.