Small updates to the router