Fixes for the merging.