Suppress MSC16 warning C4310
Suppress MSC16 warning C4701
Fix comment