3.0 save fixes

Fixes #3677
Not necessarily, it is just extra code right now.