Minor fixes
Merge conflict