Some minor changes
Merge