FLUID-5466: Fixing some formatting and broken links