Fixes borgs and ghosts storages

Fixes #2084