Minor fixes
Merged