Some small changes to add before the merge.