Msftidy fixes
Merge branch 'FireFart-msftidy_1'