diff --git a/reactos/drivers/fs/mup/mup.c b/reactos/drivers/fs/mup/mup.c
index 4ce95eea6e0..b0875567bd4 100644
--- a/reactos/drivers/fs/mup/mup.c
+++ b/reactos/drivers/fs/mup/mup.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: mup.c,v 1.1 2002/06/25 22:21:41 ekohl Exp $
+/* $Id: mup.c,v 1.2 2003/09/20 22:44:21 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -73,22 +73,22 @@ DriverEntry(PDRIVER_OBJECT DriverObject,
 
   /* Initialize driver data */
   DeviceObject->Flags = DO_DIRECT_IO;
-//  DriverObject->MajorFunction[IRP_MJ_CLOSE] = NtfsClose;
-  DriverObject->MajorFunction[IRP_MJ_CREATE] = MupCreate;
-  DriverObject->MajorFunction[IRP_MJ_CREATE_NAMED_PIPE] = MupCreate;
-  DriverObject->MajorFunction[IRP_MJ_CREATE_MAILSLOT] = MupCreate;
-//  DriverObject->MajorFunction[IRP_MJ_READ] = NtfsRead;
-//  DriverObject->MajorFunction[IRP_MJ_WRITE] = NtfsWrite;
+//  DriverObject->MajorFunction[IRP_MJ_CLOSE] = (PDRIVER_DISPATCH)NtfsClose;
+  DriverObject->MajorFunction[IRP_MJ_CREATE] = (PDRIVER_DISPATCH)MupCreate;
+  DriverObject->MajorFunction[IRP_MJ_CREATE_NAMED_PIPE] = (PDRIVER_DISPATCH)MupCreate;
+  DriverObject->MajorFunction[IRP_MJ_CREATE_MAILSLOT] = (PDRIVER_DISPATCH)MupCreate;
+//  DriverObject->MajorFunction[IRP_MJ_READ] = (PDRIVER_DISPATCH)NtfsRead;
+//  DriverObject->MajorFunction[IRP_MJ_WRITE] = (PDRIVER_DISPATCH)NtfsWrite;
 //  DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] =
-//    NtfsFileSystemControl;
+//    (PDRIVER_DISPATCH)NtfsFileSystemControl;
 //  DriverObject->MajorFunction[IRP_MJ_DIRECTORY_CONTROL] =
-//    NtfsDirectoryControl;
+//    (PDRIVER_DISPATCH)NtfsDirectoryControl;
 //  DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] =
-//    NtfsQueryInformation;
+//    (PDRIVER_DISPATCH)NtfsQueryInformation;
 //  DriverObject->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] =
-//    NtfsQueryVolumeInformation;
+//    (PDRIVER_DISPATCH)NtfsQueryVolumeInformation;
 //  DriverObject->MajorFunction[IRP_MJ_SET_VOLUME_INFORMATION] =
-//    NtfsSetVolumeInformation;
+//    (PDRIVER_DISPATCH)NtfsSetVolumeInformation;
 
   DriverObject->DriverUnload = NULL;
 
diff --git a/reactos/drivers/storage/class2/class2.c b/reactos/drivers/storage/class2/class2.c
index 97d21c29873..4f2a5b4739f 100644
--- a/reactos/drivers/storage/class2/class2.c
+++ b/reactos/drivers/storage/class2/class2.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: class2.c,v 1.39 2003/08/27 21:28:08 dwelch Exp $
+/* $Id: class2.c,v 1.40 2003/09/20 22:44:22 weiden Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -822,14 +822,14 @@ ScsiClassInitialize(IN PVOID Argument1,
 
   DPRINT("ScsiClassInitialize() called!\n");
 
-  DriverObject->MajorFunction[IRP_MJ_CREATE] = ScsiClassCreateClose;
-  DriverObject->MajorFunction[IRP_MJ_CLOSE] = ScsiClassCreateClose;
-  DriverObject->MajorFunction[IRP_MJ_READ] = ScsiClassReadWrite;
-  DriverObject->MajorFunction[IRP_MJ_WRITE] = ScsiClassReadWrite;
-  DriverObject->MajorFunction[IRP_MJ_SCSI] = ScsiClassInternalIoControl;
-  DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = ScsiClassDeviceDispatch;
-  DriverObject->MajorFunction[IRP_MJ_SHUTDOWN] = ScsiClassShutdownFlush;
-  DriverObject->MajorFunction[IRP_MJ_FLUSH_BUFFERS] = ScsiClassShutdownFlush;
+  DriverObject->MajorFunction[IRP_MJ_CREATE] = (PDRIVER_DISPATCH)ScsiClassCreateClose;
+  DriverObject->MajorFunction[IRP_MJ_CLOSE] = (PDRIVER_DISPATCH)ScsiClassCreateClose;
+  DriverObject->MajorFunction[IRP_MJ_READ] = (PDRIVER_DISPATCH)ScsiClassReadWrite;
+  DriverObject->MajorFunction[IRP_MJ_WRITE] = (PDRIVER_DISPATCH)ScsiClassReadWrite;
+  DriverObject->MajorFunction[IRP_MJ_SCSI] = (PDRIVER_DISPATCH)ScsiClassInternalIoControl;
+  DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = (PDRIVER_DISPATCH)ScsiClassDeviceDispatch;
+  DriverObject->MajorFunction[IRP_MJ_SHUTDOWN] = (PDRIVER_DISPATCH)ScsiClassShutdownFlush;
+  DriverObject->MajorFunction[IRP_MJ_FLUSH_BUFFERS] = (PDRIVER_DISPATCH)ScsiClassShutdownFlush;
   if (InitializationData->ClassStartIo)
     {
       DriverObject->DriverStartIo = InitializationData->ClassStartIo;