Fix some issues of storage operations