Fix some error introduced by the new aPourAnimal property and more class definition changes