Fix stuff in RouteRequestWatchers and Routes
All tests pass