Fixed some routing errors