Cleanup two hyperlink problems.