Minor corrections
Merge