Fixes to routing for start topology