Small changes to storage and game to make it slightly more robust in case of magical failure.