P&R tweaks for routing convergence.