3.0 save fixes

Fixes #3677
Do you need to patch the id?