Fixes for Merge issues