Fixed up some routing a bit.