Small router fixes