Resulting MSVC 32 bit warning fixed as well

Please review as well.