A few fixes
Merge conflict