Fix storage issues