Revert "Revert "Fix broken link references""

This reverts commit 532afa5e8813e5b786655cf627c3a4f071956c07.