Fixes from the testing of DBS3 upload.