Fixing a bunch of routing issues.