Fix two intermittent crashes that occur after reroute