Minor fixes to comments
Merge branch 'vnext'