diff --git a/include/callback.h b/include/callback.h
index 1a1a3d6f..9b083be6 100644
--- a/include/callback.h
+++ b/include/callback.h
@@ -24,7 +24,7 @@
 typedef Bitu (*CallBack_Handler)(void);
 extern CallBack_Handler CallBack_Handlers[];
 
-enum { CB_RETF,CB_IRET,CB_IRET_STI,CB_IRET_ONLY };
+enum { CB_RETF,CB_IRET,CB_IRET_STI };
 
 #define CB_MAX 1024
 #define CB_SEG 0xC800
diff --git a/src/cpu/core_16/main.h b/src/cpu/core_16/main.h
index 948ac46e..1bda6241 100644
--- a/src/cpu/core_16/main.h
+++ b/src/cpu/core_16/main.h
@@ -1091,14 +1091,10 @@ restart:
 			flags.type=t_CF;
 			break;
 		case 0xfa:												/* CLI */
-//			if (DPMI_IsActive()) DPMI_SetVirtualIntFlag(false);
-//			else 
-				SETFLAGBIT(IF,false);
+			SETFLAGBIT(IF,false);
 			break;
 		case 0xfb:												/* STI */
-//			if (DPMI_IsActive()) DPMI_SetVirtualIntFlag(true);
-//			else 
-				SETFLAGBIT(IF,true);
+			SETFLAGBIT(IF,true);
 #ifdef CPU_PIC_CHECK
 			if (GETFLAG(IF) && PIC_IRQCheck) goto decode_end;
 #endif
diff --git a/src/cpu/core_full/load.h b/src/cpu/core_full/load.h
index 9866be0e..b0adcce4 100644
--- a/src/cpu/core_full/load.h
+++ b/src/cpu/core_full/load.h
@@ -368,14 +368,10 @@ l_M_Ed:
 		else reg_edx=0;
 		goto nextopcode;
 	case D_CLI:
-//		if (DPMI_IsActive()) DPMI_SetVirtualIntFlag(false);
-//		else 
-			SETFLAGBIT(IF,false);
+		SETFLAGBIT(IF,false);
 		goto nextopcode;
 	case D_STI:
-//		if (DPMI_IsActive()) DPMI_SetVirtualIntFlag(true);
-//		else 
-			SETFLAGBIT(IF,true);
+		SETFLAGBIT(IF,true);
 		if (GETFLAG(IF) && PIC_IRQCheck) {
 			LEAVECORE;	
 			return CBRET_NONE;
diff --git a/src/dos/dos.cpp b/src/dos/dos.cpp
index b1cceb09..33f99628 100644
--- a/src/dos/dos.cpp
+++ b/src/dos/dos.cpp
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: dos.cpp,v 1.55 2003-10-13 21:56:25 finsterr Exp $ */
+/* $Id: dos.cpp,v 1.56 2003-10-14 08:38:35 qbix79 Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/dos/dos_ioctl.cpp b/src/dos/dos_ioctl.cpp
index 0f048413..e6cd9fb0 100644
--- a/src/dos/dos_ioctl.cpp
+++ b/src/dos/dos_ioctl.cpp
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: dos_ioctl.cpp,v 1.15 2003-10-13 21:56:25 finsterr Exp $ */
+/* $Id: dos_ioctl.cpp,v 1.16 2003-10-14 08:38:35 qbix79 Exp $ */
 
 #include <string.h>
 #include "dosbox.h"
diff --git a/src/gui/sdlmain.cpp b/src/gui/sdlmain.cpp
index f3afdbc3..db168bf0 100644
--- a/src/gui/sdlmain.cpp
+++ b/src/gui/sdlmain.cpp
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: sdlmain.cpp,v 1.47 2003-10-13 21:56:53 finsterr Exp $ */
+/* $Id: sdlmain.cpp,v 1.48 2003-10-14 08:38:36 qbix79 Exp $ */
 
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
diff --git a/src/hardware/dma.cpp b/src/hardware/dma.cpp
index 7ccd22d0..7a35d16d 100644
--- a/src/hardware/dma.cpp
+++ b/src/hardware/dma.cpp
@@ -212,7 +212,7 @@ INLINE void ResetDMA8(DMA_CHANNEL * chan) {
 	chan->address=(chan->page << 16)+chan->base_address;
 	chan->current_count=chan->base_count+1;
 	chan->current_address=chan->base_address;
-//	LOG(LOG_DMA,LOG_NORMAL)("Setup at address %X:%X count %X",chan->page<<12,chan->base_address,chan->current_count);
+	LOG(LOG_DMA,LOG_NORMAL)("Setup at address %X:%X count %X",chan->page<<12,chan->base_address,chan->current_count);
 }
 
 Bitu DMA_8_Read(Bitu dmachan,Bit8u * buffer,Bitu count) {
diff --git a/src/hardware/iohandler.cpp b/src/hardware/iohandler.cpp
index 48242f78..6e2429eb 100644
--- a/src/hardware/iohandler.cpp
+++ b/src/hardware/iohandler.cpp
@@ -24,9 +24,7 @@ IO_WriteBlock IO_WriteTable[IO_MAX];
 
 void IO_Write(Bitu num,Bit8u val) {
 	if (num<IO_MAX) IO_WriteTable[num].handler(num,val);
-	else {
-		LOG(LOG_IO,LOG_WARN)("IO:Out or range write %X2 to port %4X",val,num);
-	}
+	else LOG(LOG_IO,LOG_WARN)("IO:Out or range write %X2 to port %4X",val,num);
 }
 
 Bit8u IO_Read(Bitu num) {
diff --git a/src/hardware/timer.cpp b/src/hardware/timer.cpp
index b0529155..df58ded6 100644
--- a/src/hardware/timer.cpp
+++ b/src/hardware/timer.cpp
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: timer.cpp,v 1.18 2003-10-13 21:57:35 finsterr Exp $ */
+/* $Id: timer.cpp,v 1.19 2003-10-14 08:38:36 qbix79 Exp $ */
 
 #include "dosbox.h"
 #include "inout.h"
diff --git a/src/ints/dpmi.cpp b/src/ints/dpmi.cpp
index 21bb050e..1f6f8696 100644
--- a/src/ints/dpmi.cpp
+++ b/src/ints/dpmi.cpp
@@ -839,7 +839,7 @@ Bitu DPMI::RealModeCallback(void)
 	reg_eip = RealOff(CALLBACK_RealPointer(callback.rmCallbackReturn));
 	// call protected mode func
 	SetVirtualIntFlag(false);
-//	SETFLAGBIT(IF,false);
+	SETFLAGBIT(IF,false);
 	SETFLAGBIT(TF,false);
 	CPU_Push32(flags.word);
 	CPU_CALL(dpmi.client.bit32,dpmi.rmCallback[num].codeSelector,dpmi.rmCallback[num].codeOffset);
@@ -900,7 +900,7 @@ Bitu DPMI::CallRealIRETFrame(void)
 	SegSet16(cs,RealSeg(CALLBACK_RealPointer(callback.rmIntFrameReturn)));
 	reg_ip = RealOff(CALLBACK_RealPointer(callback.rmIntFrameReturn));
 	SetVirtualIntFlag(false);
-//	SETFLAGBIT(IF,false);
+	SETFLAGBIT(IF,false);
 	SETFLAGBIT(TF,false);
 	CPU_CALL(false,newCS,newIP);
 	return 0;
diff --git a/src/shell/shell_cmds.cpp b/src/shell/shell_cmds.cpp
index 7c442643..caceeabe 100644
--- a/src/shell/shell_cmds.cpp
+++ b/src/shell/shell_cmds.cpp
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: shell_cmds.cpp,v 1.31 2003-10-13 22:01:07 finsterr Exp $ */
+/* $Id: shell_cmds.cpp,v 1.32 2003-10-14 08:38:36 qbix79 Exp $ */
 
 #include <string.h>