Fixed some routing