Fix backup/restore and compare_responses