Fixed auto-save errors