FLUID-5362: Fixing some angle brackets