Fixed bugs in storage system