Fix errors on routing