Minor fixes
Merge Master