Fix unification of fluids