Re: [dev] minor patches