Fixed a number of routing issues.