Some route fixes