diff --git a/reactos/drivers/dd/floppy/floppy.c b/reactos/drivers/dd/floppy/floppy.c
index 25045495975..7694fcd6321 100644
--- a/reactos/drivers/dd/floppy/floppy.c
+++ b/reactos/drivers/dd/floppy/floppy.c
@@ -109,7 +109,7 @@ FloppyCreateController(PDRIVER_OBJECT DriverObject,
    DeviceDescription.Master = FALSE;
    DeviceDescription.ScatterGather = FALSE;
    DeviceDescription.AutoInitialize = FALSE;
-   DeviceDescription.Dma32BitAddress = FALSE;
+   DeviceDescription.Dma32BitAddresses = FALSE;
    DeviceDescription.DmaChannel = ControllerParameters->DmaChannel;
    DeviceDescription.InterfaceType = Isa;
    //   DeviceDescription.DmaWidth = Width8Bits;
diff --git a/reactos/hal/halx86/dma.c b/reactos/hal/halx86/dma.c
index 8ba8b19f905..9b19ef720dc 100644
--- a/reactos/hal/halx86/dma.c
+++ b/reactos/hal/halx86/dma.c
@@ -1,4 +1,4 @@
-/* $Id: dma.c,v 1.4 2003/06/07 12:25:53 chorns Exp $
+/* $Id: dma.c,v 1.5 2003/08/20 04:18:31 royce Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -95,7 +95,7 @@ HalGetAdapter (PDEVICE_DESCRIPTION	DeviceDescription,
     return NULL;
   if( DeviceDescription->AutoInitialize )
     return NULL;
-  if( DeviceDescription->Dma32BitAddress )
+  if( DeviceDescription->Dma32BitAddresses )
     return NULL;
   if( DeviceDescription->InterfaceType != Isa )
      return NULL;
diff --git a/reactos/include/ntos/haltypes.h b/reactos/include/ntos/haltypes.h
index 2377d0546c8..b98d3d38129 100755
--- a/reactos/include/ntos/haltypes.h
+++ b/reactos/include/ntos/haltypes.h
@@ -1,4 +1,4 @@
-/* $Id: haltypes.h,v 1.2 2003/08/14 18:30:27 silverblade Exp $
+/* $Id: haltypes.h,v 1.3 2003/08/20 04:18:31 royce Exp $
  *
  * COPYRIGHT:                See COPYING in the top level directory
  * PROJECT:                  ReactOS kernel
@@ -64,7 +64,7 @@ typedef struct _DEVICE_DESCRIPTION
   BOOLEAN ScatterGather;
   BOOLEAN DemandMode;
   BOOLEAN AutoInitialize;
-  BOOLEAN Dma32BitAddress;
+  BOOLEAN Dma32BitAddresses;
   BOOLEAN IgnoreCount;
   BOOLEAN Reserved1;
   BOOLEAN Reserved2;
diff --git a/reactos/ntoskrnl/rtl/unicode.c b/reactos/ntoskrnl/rtl/unicode.c
index bbe9501d936..ada2feba2ee 100644
--- a/reactos/ntoskrnl/rtl/unicode.c
+++ b/reactos/ntoskrnl/rtl/unicode.c
@@ -1,4 +1,4 @@
-/* $Id: unicode.c,v 1.30 2003/07/11 01:23:16 royce Exp $
+/* $Id: unicode.c,v 1.31 2003/08/20 04:18:31 royce Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -1252,9 +1252,16 @@ RtlUnicodeStringToInteger(IN PUNICODE_STRING String,
 		{
 			return STATUS_INVALID_PARAMETER;
 		}
+		/*
 		else if ((((*Str > L'9') || (*Str < L'0')) ||
 		          ((towupper (*Str) > L'F') ||
 		           (towupper (*Str) < L'A'))) && (Base == 16))
+		*/
+		else if ((*Str < '0' || 
+				 (*Str > '9' && *Str < 'A') || 
+				 (*Str > 'F' && *Str < 'a') || 
+				 *Str > 'f') && 
+			  (Base == 16))
 		{
 			return STATUS_INVALID_PARAMETER;
 		}