MSVC changes

Changes for Win64 support.