couple needed changes that make viewchange recovery actually work (sometimes)