Reapply storage fixes