storage fixups