Addressing some comments and improvement of MSVC support.