Path management, routing fixes on the way.