Fixes for the merge.