Fix a few routing issues

Fix a few routing issues.

Refs #4120 
Refs #4126