FLUID-5439: Fixed more links