add storage fixes