FLUID-5439: Fixes in response to review.