A few fixes for setup routing