Fix 2 Router-related errors