Re: [Cin] Two patches from Andrea's testing