More routes fixes