Some more merge tweaks