FLUID-5511: Fixes based on review