Updated to build successfully with MSVCPP.