Fixes in routes