FIXUP with routing fixes