FLUID-5161: Fixed some issues with the build