Fix Fluid duplication.
Fix liquids not being noticed on arrival.