storage scenario fixes