storage bug fixes