Fix weired route and more