3.0 save fixes

Fixes #3677
No, not really. Should I remove it?