3.0 save fixes

Fixes #3677