Minor router changes