Fixed some route problems