Patch up the samples.