Fix the basic loading and saving issue.