Fix MSFTidy complaints