Minor changes
Merge and typo fix