A number of changes
Fix a merge conflict and other changes