Fixes in routing