FLUID-5439: More fixes in response to review.

Hopefully the last!