Fixes for Merge