SRP routing fixes