Fix Warnings due to reverse route ambiguity

@gklopper, can you take a butchers - warnings all gone