FLUID-5439: Fixing broken links