Small changes, to avoid merge conflict