diff --git a/reactos/ntoskrnl/io/buildirp.c b/reactos/ntoskrnl/io/buildirp.c
index 9ea987d222c..48e947b3dec 100644
--- a/reactos/ntoskrnl/io/buildirp.c
+++ b/reactos/ntoskrnl/io/buildirp.c
@@ -1,4 +1,4 @@
-/* $Id: buildirp.c,v 1.42 2004/08/10 06:26:42 ion Exp $
+/* $Id: buildirp.c,v 1.43 2004/08/12 16:43:11 ion Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -160,8 +160,6 @@ IoBuildAsynchronousFsdRequest(ULONG MajorFunction,
 	  }
      }
 
-   Irp->UserIosb = IoStatusBlock;
-
    return(Irp);
 }
 
diff --git a/reactos/ntoskrnl/io/device.c b/reactos/ntoskrnl/io/device.c
index 158f938425e..5f458a8a213 100644
--- a/reactos/ntoskrnl/io/device.c
+++ b/reactos/ntoskrnl/io/device.c
@@ -1,4 +1,4 @@
-/* $Id: device.c,v 1.71 2004/06/23 21:42:49 ion Exp $
+/* $Id: device.c,v 1.72 2004/08/12 16:43:12 ion Exp $
  *
  * COPYRIGHT:      See COPYING in the top level directory
  * PROJECT:        ReactOS kernel
@@ -647,7 +647,8 @@ IoCreateDevice(
        CreatedDeviceObject->DeviceType == FILE_DEVICE_CD_ROM ||
        CreatedDeviceObject->DeviceType == FILE_DEVICE_TAPE)
    {
-      IoAttachVpb(CreatedDeviceObject);
+      IoAttachVpb(CreatedDeviceObject);      
+      CreatedDeviceObject->SectorSize = 512; /* FIXME */
    }
   
    DeviceObjectExtension =
diff --git a/reactos/ntoskrnl/io/irp.c b/reactos/ntoskrnl/io/irp.c
index 6b330b1fd3f..7d8971f1320 100644
--- a/reactos/ntoskrnl/io/irp.c
+++ b/reactos/ntoskrnl/io/irp.c
@@ -1,4 +1,4 @@
-/* $Id: irp.c,v 1.63 2004/08/10 06:26:42 ion Exp $
+/* $Id: irp.c,v 1.64 2004/08/12 16:43:12 ion Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -129,20 +129,24 @@ IoMakeAssociatedIrp(PIRP Irp,
  * RETURNS: The irp allocated
  */
 {
-  PIRP AssocIrp;
+   PIRP AssocIrp;
 
-    /* Allocate the IRP */
-    AssocIrp = IoAllocateIrp(StackSize,FALSE);
+   /* Allocate the IRP */
+   AssocIrp = IoAllocateIrp(StackSize,FALSE);
+   if (AssocIrp == NULL)
+      return NULL;
 
-    /* Set the Flags */
-    AssocIrp->Flags |= IRP_ASSOCIATED_IRP;
+   /* Set the Flags */
+   AssocIrp->Flags |= IRP_ASSOCIATED_IRP;
 
-    /* Set the Thread */
-    AssocIrp->Tail.Overlay.Thread = Irp->Tail.Overlay.Thread;
+   /* Set the Thread */
+   AssocIrp->Tail.Overlay.Thread = Irp->Tail.Overlay.Thread;
 
-    /* Associate them */
-    AssocIrp->AssociatedIrp.MasterIrp = Irp;
-    return AssocIrp;
+   /* Associate them */
+   AssocIrp->AssociatedIrp.MasterIrp = Irp;
+   InterlockedIncrement(&Irp->AssociatedIrp.IrpCount);
+ 
+   return AssocIrp;
 }
 
 
@@ -292,8 +296,8 @@ IofCompleteRequest(PIRP Irp,
 {
    ULONG             i;
    NTSTATUS          Status;
-   PDEVICE_OBJECT    DeviceObject;
    PFILE_OBJECT      OriginalFileObject;
+   PDEVICE_OBJECT    DeviceObject;
    KIRQL             oldIrql;
    PMDL              Mdl;
 
@@ -309,6 +313,10 @@ IofCompleteRequest(PIRP Irp,
       Irp->PendingReturned = TRUE;
    }
 
+   /*
+    * Run the completion routines.
+    */
+
    for (i=Irp->CurrentLocation;i<(ULONG)Irp->StackCount;i++)
    {
       /*
@@ -350,6 +358,27 @@ IofCompleteRequest(PIRP Irp,
       }
    }
 
+   /* Windows NT File System Internals, page 165 */
+   if (Irp->Flags & IRP_ASSOCIATED_IRP)
+   {
+      ULONG MasterIrpCount;
+      PIRP MasterIrp = Irp->AssociatedIrp.MasterIrp;
+
+      MasterIrpCount = InterlockedDecrement(&MasterIrp->AssociatedIrp.IrpCount);
+      while ((Mdl = Irp->MdlAddress))
+      {
+         Irp->MdlAddress = Mdl->Next;
+         MmUnlockPages(Mdl);
+         IoFreeMdl(Mdl);
+      }
+      IoFreeIrp(Irp);
+      if (MasterIrpCount == 0)
+      {
+         IofCompleteRequest(MasterIrp, IO_NO_INCREMENT);
+      }
+      return;
+   }
+
    /*
     * Were done calling completion routines. Now do any cleanup that can be 
     * done in an arbitrarily context.
@@ -409,17 +438,14 @@ IofCompleteRequest(PIRP Irp,
    
 */
    
-   //Windows NT File System Internals, page 166/167
-   if (!(Irp->Flags & IRP_ASSOCIATED_IRP))
+
+   for (Mdl = Irp->MdlAddress; Mdl; Mdl = Mdl->Next)
    {
-      for (Mdl = Irp->MdlAddress; Mdl; Mdl = Mdl->Next)
-      {
-         /* 
-          * Undo the MmProbeAndLockPages. If MmGetSystemAddressForMdl was called
-          * on this mdl, this mapping (if any) is also undone by MmUnlockPages.
-          */
-         MmUnlockPages(Irp->MdlAddress);
-      }
+      /* 
+       * Undo the MmProbeAndLockPages. If MmGetSystemAddressForMdl was called
+       * on this mdl, this mapping (if any) is also undone by MmUnlockPages.
+       */
+      MmUnlockPages(Mdl);
    }
     
    //Windows NT File System Internals, page 154
@@ -459,8 +485,6 @@ IofCompleteRequest(PIRP Irp,
       KeLowerIrql(oldIrql);
       DPRINT("Finished completition routine\n");
    }
-
-
 }