Better recovery, fewer memory leaks