Two saving bugs.

Need a test suite ...