Fix saving and deleting