Routing fixup