Bug corrections in router