FLUID-5486: More review fixes