Merge in a few changes.