More routing quirk fixes.