Misc fixes to indirected_routes