Fix issues with saving.