1. fix through path

    Closed
    #171989083 0 2 1 0

  2. (Hopefully) fix issues with routers

    Closed
    #170906572 0 1 1 0