Fix storage use in backend