Fix a few saving issues.