Re: Two bugs