Minor changes to fix the merge