diff --git a/reactos/lib/rtl/debug.c b/reactos/lib/rtl/debug.c
index f91ad108987..77f35e16904 100644
--- a/reactos/lib/rtl/debug.c
+++ b/reactos/lib/rtl/debug.c
@@ -23,7 +23,6 @@ DebugPrint(IN PANSI_STRING DebugString,
            IN ULONG Level)
 {
     /* Call the INT2D Service */
-    return STATUS_SUCCESS;
     return DebugService(BREAKPOINT_PRINT,
                         DebugString->Buffer,
                         DebugString->Length,
diff --git a/reactos/ntoskrnl/kd/kdmain.c b/reactos/ntoskrnl/kd/kdmain.c
index 168bf01909e..4e0d788471c 100644
--- a/reactos/ntoskrnl/kd/kdmain.c
+++ b/reactos/ntoskrnl/kd/kdmain.c
@@ -127,6 +127,7 @@ KdpEnterDebuggerException(IN PKTRAP_FRAME TrapFrame,
 
         /* This we can handle: simply bump EIP */
         Context->Eip++;
+        return TRUE;
     }
 
     /* Get out of here if the Debugger isn't connected */
diff --git a/reactos/ntoskrnl/ke/i386/trap.s b/reactos/ntoskrnl/ke/i386/trap.s
index 0bab3fcf9a7..cba533b27eb 100644
--- a/reactos/ntoskrnl/ke/i386/trap.s
+++ b/reactos/ntoskrnl/ke/i386/trap.s
@@ -604,7 +604,7 @@ NoParams:
 
     /* Set the record in ECX and check if this was V86 */
     mov ecx, esp
-    test dword ptr [esp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK
+    test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK
     jz SetPreviousMode
 
     /* Set V86 mode */
@@ -791,6 +791,7 @@ EnableInterrupts3:
     sti
 
 PrepInt3:
+
     /* Prepare the exception */
     mov esi, ecx
     mov edi, edx