Minor changes to avoid merge conflicts