Fixed some more routing issues.