Fix fluid behavior some more