Fix storage key usage