First round of route fixing.