Minor fixes
Cosmetic
Merge Master