storage fixes