fix some bugs in storage side