Fix save loading

Getting ready to promote.