touchups after last merge.