Router: small fixes