More routing fiddling