Fixed some routing stuff