Some repairs after merge