Small changes after merge