Merge fixes by hank.