Fixes on the Router