Minor fixes
Merging