Re: EFS fixes