Re: [PATCH] mock simple fixes