Minor rerouting stuffs