Fix a few routing issues.