Routing related fixes for #55