#14: Fixed some saving problems.