Routing: small changes