FLUID-5377: Fixes based on code review.