Fix some routes issues