Patch up a bit after merge.