Some routing updates, more needed