Fixes to router -