diff --git a/Include/Cxbx.h b/Include/Cxbx.h
index 44ec7da60..7602b1678 100644
--- a/Include/Cxbx.h
+++ b/Include/Cxbx.h
@@ -58,16 +58,20 @@ typedef signed char    sint08;
 typedef signed short   sint16;
 typedef signed long    sint32;
 
-// ******************************************************************
-// * Version information
-// ******************************************************************
-#define _CXBX_VERSION "0.7.2"
-
 // ******************************************************************
 // * Define this to trace intercepted function calls
 // ******************************************************************
 #define _DEBUG_TRACE
 
+// ******************************************************************
+// * Version information
+// ******************************************************************
+#ifndef _DEBUG_TRACE
+#define _CXBX_VERSION "0.7.2"
+#else
+#define _CXBX_VERSION "0.7.2-Trace"
+#endif
+
 // ******************************************************************
 // * Round up dwValue to nearest multiple of dwMult
 // ******************************************************************
diff --git a/Source/Win32/CxbxKrnl/Emu.cpp b/Source/Win32/CxbxKrnl/Emu.cpp
index 6bed61aec..b05e07801 100644
--- a/Source/Win32/CxbxKrnl/Emu.cpp
+++ b/Source/Win32/CxbxKrnl/Emu.cpp
@@ -385,7 +385,7 @@ extern "C" CXBXKRNL_API void NTAPI EmuInit
     {
         EmuSwapFS();   // XBox FS
 
-        _asm int 3
+//        _asm int 3
 
         Entry();
 
diff --git a/Source/Win32/CxbxKrnl/EmuD3D8.cpp b/Source/Win32/CxbxKrnl/EmuD3D8.cpp
index 0fe3d19a8..8f487b88b 100644
--- a/Source/Win32/CxbxKrnl/EmuD3D8.cpp
+++ b/Source/Win32/CxbxKrnl/EmuD3D8.cpp
@@ -1327,6 +1327,12 @@ HRESULT WINAPI xd3d8::EmuIDirect3DResource8_Register
     // ******************************************************************
     switch(pResource->Common & X_D3DCOMMON_TYPE_MASK)
     {
+        case X_D3DCOMMON_TYPE_VERTEXBUFFER:
+        {
+            EmuCleanup("Remember to do vertex buffers in here ;]");
+        }
+        break;
+
         case X_D3DCOMMON_TYPE_TEXTURE:
         {
             X_D3DPixelContainer *pPixelContainer = (X_D3DPixelContainer*)pResource;
diff --git a/Source/Win32/CxbxKrnl/EmuXapi.cpp b/Source/Win32/CxbxKrnl/EmuXapi.cpp
index a2023b837..5f83dc8fa 100644
--- a/Source/Win32/CxbxKrnl/EmuXapi.cpp
+++ b/Source/Win32/CxbxKrnl/EmuXapi.cpp
@@ -426,29 +426,14 @@ VOID WINAPI xapi::EmuXapiInitProcess()
 
 		EmuSwapFS();   // XBox FS
 
-		uint32 pHeapParameters = (uint32)&HeapParameters;
 		uint32 dwPeHeapReserve = g_pXbeHeader->dwPeHeapReserve;
 		uint32 dwPeHeapCommit  = g_pXbeHeader->dwPeHeapCommit;
 
         PVOID dwResult = 0;
 
-        #define HEAP_GROWABLE                 0x00000002
+        #define HEAP_GROWABLE 0x00000002
 
-        __asm
-		{
-            xor ecx, ecx
-
-			push pHeapParameters
-			push ecx
-			push dwPeHeapCommit
-			push dwPeHeapReserve
-			push ecx
-			push HEAP_GROWABLE
-			call g_pRtlCreateHeap
-			mov dwResult, eax
-		}
-
-        *xapi::EmuXapiProcessHeap = dwResult;
+        *xapi::EmuXapiProcessHeap = xapi::g_pRtlCreateHeap(HEAP_GROWABLE, 0, dwPeHeapReserve, dwPeHeapCommit, 0, &HeapParameters);
 	}
 
     return;