Re: Some little fixes