Re: Minor fixes