Minor fixes
Merge