More changes in Storage and towards fixing the memory leak that I had forgotten to commit.