Fixing routing issues.