Reduce number of MSVC /W4 warnings