Some storage fixes