Minor updates to StorageComponent.