Corrections after merge