diff --git a/common.gypi b/common.gypi
index deb3643d7..887b39264 100644
--- a/common.gypi
+++ b/common.gypi
@@ -30,6 +30,9 @@
         'defines': [
           '_WIN64=1',
           '_AMD64_=1',
+
+          # HACK: it'd be nice to use the proper functions, when available.
+          '_CRT_SECURE_NO_WARNINGS=1',
         ],
       }],
     ],
@@ -63,7 +66,7 @@
             'ExceptionHandling': '1', # /EHsc
             'AdditionalOptions': [
               '/MP',    # Multiprocessor build
-              '/TP',    # Compile as C++
+              #'/TP',    # Compile as C++
               '/EHsc',  # C++ exception handling,
             ],
           },
diff --git a/src/xenia/cpu/global_exports.cc b/src/xenia/cpu/global_exports.cc
index dc9e64d77..30c396037 100644
--- a/src/xenia/cpu/global_exports.cc
+++ b/src/xenia/cpu/global_exports.cc
@@ -43,8 +43,8 @@ void _cdecl XeInvalidInstruction(
     xe_ppc_state_t* state, uint64_t cia, uint64_t data,
     void* unused) {
   ppc::InstrData i;
-  i.address = cia;
-  i.code = data;
+  i.address = (uint32_t)cia;
+  i.code = (uint32_t)data;
   i.type = ppc::GetInstrType(i.code);
 
   if (!i.type) {
@@ -89,7 +89,7 @@ void _cdecl XeTraceUserCall(
 void _cdecl XeTraceInstruction(
     xe_ppc_state_t* state, uint64_t cia, uint64_t data,
     void* unused) {
-  ppc::InstrType* type = ppc::GetInstrType(data);
+  ppc::InstrType* type = ppc::GetInstrType((uint32_t)data);
   XELOGCPU("TRACE: %.8X %.8X %s %s",
            cia, data,
            type && type->emit ? " " : "X",