Minor storage mods