Minor changes to Fluid functions