Fix some routing errors