Corrected issues caused by fixing problems in MSVC caused by...