Quick fixes to make router work with latest shark branch again...

- Probably still some bumps
- Use with caution
- Tests not written yet