Storage fixes

Storage client updates