Fixes in saving.