Small changes due to merge conflict