diff --git a/Cxbx.opt b/Cxbx.opt
index 3c6aca52d..03aee1c77 100644
Binary files a/Cxbx.opt and b/Cxbx.opt differ
diff --git a/Include/Cxbx.h b/Include/Cxbx.h
index 45e46f2cb..0a212ea63 100644
--- a/Include/Cxbx.h
+++ b/Include/Cxbx.h
@@ -63,10 +63,10 @@ typedef signed long    sint32;
 //#define _DEBUG_ALLOC
 
 // 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 these to dump textures
 //#define _DEBUG_DUMP_TEXTURE_SETTEXTURE "C:\\Aaron\\Textures\\"
@@ -74,9 +74,9 @@ typedef signed long    sint32;
 
 // version information
 #ifndef _DEBUG_TRACE
-#define _CXBX_VERSION "0.8.0-Pre3"
+#define _CXBX_VERSION "0.8.0"
 #else
-#define _CXBX_VERSION "0.8.0-Pre3-Trace"
+#define _CXBX_VERSION "0.8.0-Trace"
 #endif
 
 // round dwValue to the nearest multiple of dwMult
diff --git a/Source/Win32/CxbxKrnl/EmuXapi.cpp b/Source/Win32/CxbxKrnl/EmuXapi.cpp
index 8500592de..2df8590e6 100644
--- a/Source/Win32/CxbxKrnl/EmuXapi.cpp
+++ b/Source/Win32/CxbxKrnl/EmuXapi.cpp
@@ -1198,7 +1198,7 @@ VOID WINAPI XTL::EmuXapiThreadStartup
     }
     */
 
-    _asm int 3;
+    //_asm int 3;
 
     return;
 }
diff --git a/Source/Win32/CxbxKrnl/HLEIntercept.cpp b/Source/Win32/CxbxKrnl/HLEIntercept.cpp
index 70ee9432d..85142c61e 100644
--- a/Source/Win32/CxbxKrnl/HLEIntercept.cpp
+++ b/Source/Win32/CxbxKrnl/HLEIntercept.cpp
@@ -652,7 +652,9 @@ static void EmuInstallWrappers(OOVPATable *OovpaTable, uint32 OovpaTableSize, Xb
 
         if(pFunc != 0)
         {
+            #ifdef _DEBUG_TRACE
             DbgPrintf("HLE: 0x%.08X -> %s\n", pFunc, OovpaTable[a].szFuncName);
+            #endif
 
             if(OovpaTable[a].lpRedirect == 0)
             {