Adjustments after merge