Fixes to the storage API