Fix fluid stuff on develop branch