Small changes after the merge