Fix broken links
Merge fixes