[PATCH] mock simple fixes