Fix storage stuff