Various fixes to route translations