Re: a couple minor patches