Fix storages