Routing tweaks

Signed-off-by: Max Fierke <max@maxfierke.com>