Fixed small issues in storages