FLUID-5466: Fixes based on review