Backported storage fixes