Fixed some location issues with the new storage.