FLUID-5511: fixes to broken links