Lost some minor changes in the merge.