Fixes for data merge