more route fixups