diff --git a/Cxbx.opt b/Cxbx.opt
index de03584c0..f5c4f117f 100644
Binary files a/Cxbx.opt and b/Cxbx.opt differ
diff --git a/Include/Cxbx.h b/Include/Cxbx.h
index 81e28f561..dd729d816 100644
--- a/Include/Cxbx.h
+++ b/Include/Cxbx.h
@@ -55,10 +55,10 @@ typedef signed short   sint16;
 typedef signed long    sint32;
 
 // define this to trace intercepted function calls
-#define _DEBUG_TRACE
+//#define _DEBUG_TRACE
 
 // define this to trace warnings
-#define _DEBUG_WARNINGS
+//#define _DEBUG_WARNINGS
 
 // define this to enable wireframe mode
 #define _DEBUG_WIREFRAME
diff --git a/Source/Win32/CxbxKrnl/EmuD3D8.cpp b/Source/Win32/CxbxKrnl/EmuD3D8.cpp
index a8e08fe70..6b9ea955f 100644
--- a/Source/Win32/CxbxKrnl/EmuD3D8.cpp
+++ b/Source/Win32/CxbxKrnl/EmuD3D8.cpp
@@ -1842,17 +1842,20 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_CreateVertexShader
     // TODO: Intelligently fill out these fields as necessary
     ZeroMemory(pD3DVertexShader, sizeof(X_D3DVertexShader));
 
+    HRESULT hRet = D3D_OK;
+
+    /*
     HRESULT hRet = g_pD3DDevice8->CreateVertexShader
     (
         pDeclaration,
         pFunction,
         &pD3DVertexShader->Handle,
         g_dwVertexShaderUsage   // TODO: HACK: Xbox has extensions!
-    );
+    );*/
 
     *pHandle = (DWORD)pD3DVertexShader;
 
-    if(FAILED(hRet))
+//    if(FAILED(hRet))
     {
         pD3DVertexShader->Handle = 0;
 
@@ -5693,7 +5696,7 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetVertexShader
         // create emulated shader struct
         X_D3DVertexShader *pD3DVertexShader = (X_D3DVertexShader*)Handle;
         
-        hRet = g_pD3DDevice8->SetVertexShader(0);
+        hRet = g_pD3DDevice8->SetVertexShader(D3DFVF_XYZ|D3DFVF_TEX0);
     }
     else
     {