FLUID-5377: clean up and path fixes