Various fixes that have been waiting to be pulled in
We now only have one router process