Fixes to the Merge