Fix saving options