More post merge local tweaks