Corrected some compilation problems in MSVC caused by warning fixes.