router fixes