Merge pull request #311 from jrperritt/object-storage-fixes

[RFR] Object storage fixes