Fix some bugs with Route