Re: User-Guide fixes