Re: Small fixes