FLUID-5379: Improvements following review