Fixes to save content