A few more storage changes.