Storage fixups