Make the links work.
Merge pull request #557 from afred/bad-404-links-556

Make the links work.