Small changes to the router etc