More improvements to client routing for stability and robustness...