diff --git a/reactos/drivers/dd/ide/ide.c b/reactos/drivers/dd/ide/ide.c
index 7db4821a53c..a07209acb15 100644
--- a/reactos/drivers/dd/ide/ide.c
+++ b/reactos/drivers/dd/ide/ide.c
@@ -1,4 +1,4 @@
-/* $Id: ide.c,v 1.25 1999/12/30 01:51:40 dwelch Exp $
+/* $Id: ide.c,v 1.26 2000/01/06 00:26:16 dwelch Exp $
  *
  *  IDE.C - IDE Disk driver 
  *     written by Rex Jolliff
@@ -2023,9 +2023,12 @@ IDEIoTimer(PDEVICE_OBJECT DeviceObject,
             if (++ControllerExtension->Retries > IDE_MAX_CMD_RETRIES)
               {
                 DPRINT("Max retries has been reached, IRP finished with error\n");
-                ControllerExtension->CurrentIrp->IoStatus.Status = STATUS_IO_TIMEOUT;
-                ControllerExtension->CurrentIrp->IoStatus.Information = 0;
-                IDEFinishOperation(ControllerExtension);
+		 if (ControllerExtension->CurrentIrp != NULL)
+		   {
+		      ControllerExtension->CurrentIrp->IoStatus.Status = STATUS_IO_TIMEOUT;
+		      ControllerExtension->CurrentIrp->IoStatus.Information = 0;
+		      IDEFinishOperation(ControllerExtension);
+		   }
                 ControllerExtension->TimerState = IDETimerIdle;
                 ControllerExtension->TimerCount = 0;
               }
diff --git a/reactos/lib/ntdll/stdlib/atoi64.c b/reactos/lib/ntdll/stdlib/atoi64.c
index bf75b342415..82cae0032cb 100644
--- a/reactos/lib/ntdll/stdlib/atoi64.c
+++ b/reactos/lib/ntdll/stdlib/atoi64.c
@@ -1,4 +1,4 @@
-/* $Id: atoi64.c,v 1.1 1999/12/30 01:32:35 ekohl Exp $
+/* $Id: atoi64.c,v 1.2 2000/01/06 00:26:15 dwelch Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -9,6 +9,8 @@
 #include <stdlib.h>
 #include <ctype.h>
 
+typedef long long __int64;
+
 __int64
 _atoi64 (const char *nptr)
 {
@@ -38,4 +40,4 @@ _atoi64 (const char *nptr)
        return value;
 }
 
-/* EOF */
\ No newline at end of file
+/* EOF */
diff --git a/reactos/lib/ntdll/stdlib/itoa.c b/reactos/lib/ntdll/stdlib/itoa.c
index 3afb1a34c8f..1f1e2d2cd3d 100644
--- a/reactos/lib/ntdll/stdlib/itoa.c
+++ b/reactos/lib/ntdll/stdlib/itoa.c
@@ -11,6 +11,8 @@
 /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */
 #include <stdlib.h>
 
+typedef long long __int64;
+typedef unsigned long long __uint64;
 
 char *
 _i64toa(__int64 value, char *string, int radix)
@@ -18,7 +20,7 @@ _i64toa(__int64 value, char *string, int radix)
   char tmp[65];
   char *tp = tmp;
   __int64 i;
-  unsigned __int64 v;
+  __uint64 v;
   __int64 sign;
   char *sp;
 
@@ -31,7 +33,7 @@ _i64toa(__int64 value, char *string, int radix)
   if (sign)
     v = -value;
   else
-    v = (unsigned __int64)value;
+    v = (__uint64)value;
   while (v || tp == tmp)
   {
     i = v % radix;
@@ -161,4 +163,4 @@ _ultoa(unsigned long value, char *string, int radix)
     *sp++ = *--tp;
   *sp = 0;
   return string;
-}
\ No newline at end of file
+}
diff --git a/reactos/lib/ntdll/stdlib/itow.c b/reactos/lib/ntdll/stdlib/itow.c
index 47537b6dde2..0081e220e7c 100644
--- a/reactos/lib/ntdll/stdlib/itow.c
+++ b/reactos/lib/ntdll/stdlib/itow.c
@@ -11,13 +11,16 @@
 /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */
 #include <stdlib.h>
 
+typedef long long __int64;
+typedef unsigned long long __uint64;
+
 wchar_t *
 _i64tow(__int64 value, wchar_t *string, int radix)
 {
   wchar_t tmp[65];
   wchar_t *tp = tmp;
   __int64 i;
-  unsigned __int64 v;
+  __uint64 v;
   __int64 sign;
   wchar_t *sp;
 
@@ -30,7 +33,7 @@ _i64tow(__int64 value, wchar_t *string, int radix)
   if (sign)
     v = -value;
   else
-    v = (unsigned __int64)value;
+    v = (__uint64)value;
   while (v || tp == tmp)
   {
     i = v % radix;
diff --git a/reactos/lib/ntdll/stdlib/wtoi64.c b/reactos/lib/ntdll/stdlib/wtoi64.c
index f915bcd51ca..e1754826e85 100644
--- a/reactos/lib/ntdll/stdlib/wtoi64.c
+++ b/reactos/lib/ntdll/stdlib/wtoi64.c
@@ -1,4 +1,4 @@
-/* $Id: wtoi64.c,v 1.1 1999/12/30 01:32:35 ekohl Exp $
+/* $Id: wtoi64.c,v 1.2 2000/01/06 00:26:15 dwelch Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -9,6 +9,9 @@
 #include <stdlib.h>
 #include <ctype.h>
 
+typedef long long __int64;
+typedef unsigned long long __uint64;
+
 __int64
 _wtoi64 (const wchar_t *nptr)
 {
@@ -38,4 +41,4 @@ _wtoi64 (const wchar_t *nptr)
        return value;
 }
 
-/* EOF */
\ No newline at end of file
+/* EOF */
diff --git a/reactos/ntoskrnl/io/queue.c b/reactos/ntoskrnl/io/queue.c
index 9fc20d38581..9daf6587d0b 100644
--- a/reactos/ntoskrnl/io/queue.c
+++ b/reactos/ntoskrnl/io/queue.c
@@ -10,7 +10,7 @@
 
 #include <ddk/ntddk.h>
 
-//#define NDEBUG
+#define NDEBUG
 #include <internal/debug.h>
 
 /* FUNCTIONS *****************************************************************/
diff --git a/reactos/ntoskrnl/ke/kqueue.c b/reactos/ntoskrnl/ke/kqueue.c
index e3e4244118c..907393173b5 100644
--- a/reactos/ntoskrnl/ke/kqueue.c
+++ b/reactos/ntoskrnl/ke/kqueue.c
@@ -12,7 +12,7 @@
 
 #include <ddk/ntddk.h>
 
-//#define NDEBUG
+#define NDEBUG
 #include <internal/debug.h>
 
 /* FUNCTIONS *****************************************************************/