Fixes to Merge issues