diff --git a/reactos/drivers/fs/vfat/fat.c b/reactos/drivers/fs/vfat/fat.c
index dbdc40e3a1c..720fdbe82a6 100644
--- a/reactos/drivers/fs/vfat/fat.c
+++ b/reactos/drivers/fs/vfat/fat.c
@@ -1,5 +1,5 @@
 /*
- * $Id: fat.c,v 1.26 2001/06/14 10:02:59 ekohl Exp $
+ * $Id: fat.c,v 1.27 2001/06/15 11:14:53 ekohl Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -690,7 +690,7 @@ FAT32WriteCluster(PDEVICE_EXTENSION DeviceExt,
     }
   ExFreePool (Block);
 #endif
-  KeBugCheck(0);
+//  KeBugCheck(0);
   return(STATUS_SUCCESS);
 }
 
diff --git a/reactos/drivers/fs/vfat/makefile b/reactos/drivers/fs/vfat/makefile
index c424c128c2f..34b0604fecd 100644
--- a/reactos/drivers/fs/vfat/makefile
+++ b/reactos/drivers/fs/vfat/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.29 2001/05/02 03:18:03 rex Exp $
+# $Id: makefile,v 1.30 2001/06/15 11:15:32 ekohl Exp $
 #
 #
 PATH_TO_TOP = ../../..
@@ -7,11 +7,12 @@ TARGET=vfatfs
 
 OBJECTS = blockdev.o close.o create.o dir.o dirwr.o iface.o string.o fat.o \
           rw.o finfo.o volume.o shutdown.o cleanup.o fcb.o $(TARGET).coff
-LIBS = ../../../ntoskrnl/ntoskrnl.a
+
+LIBS = $(PATH_TO_TOP)/ntoskrnl/ntoskrnl.a
 
 CFLAGS = -g -Wall -Werror
 
-all: $(TARGET).nostrip.sys $(TARGET).sys
+all: $(TARGET).sys.unstripped $(TARGET).sys
 
 .phony: all
 
@@ -22,9 +23,11 @@ ifeq ($(DOSCLI),yes)
 	- $(RM) junk.tmp
 	- $(RM) base.tmp
 	- $(RM) temp.exp
+	- $(RM) $(TARGET).sym
 	- $(RM) $(TARGET).sys
+	- $(RM) $(TARGET).sys.unstripped
 else
-	- $(RM) $(OBJECTS) $(TARGET).coff junk.tmp base.tmp temp.exp $(TARGET).sys $(TARGET).nostrip.sys
+	- $(RM) $(OBJECTS) $(TARGET).coff junk.tmp base.tmp temp.exp $(TARGET).sys $(TARGET).sys.unstripped
 endif
 
 .phony: clean
@@ -39,7 +42,8 @@ dist: ../../../$(DIST_DIR)/drivers/$(TARGET).sys
 ../../../$(DIST_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
 	$(CP) $(TARGET).sys ../../../$(DIST_DIR)/drivers/$(TARGET).sys
 
-$(TARGET).nostrip.sys: $(OBJECTS) $(LIBS)
+
+$(TARGET).sys.unstripped: $(OBJECTS) $(LIBS)
 	$(LD) -r -o vfat.o $(OBJECTS)
 	$(CC) -specs=../../svc_specs -mdll -o junk.tmp -Wl,--defsym,_end=end -Wl,--defsym,_edata=__data_end__ -Wl,--defsym,_etext=etext -Wl,--base-file,base.tmp -Wl,"-h vfatfs.sys" vfat.o $(LIBS)
 	- $(RM) junk.tmp
@@ -49,8 +53,9 @@ $(TARGET).nostrip.sys: $(OBJECTS) $(LIBS)
 		--output-exp temp.exp \
 		--def vfatfs.def
 	- $(RM) base.tmp
-	$(CC) -Wl,--image-base,0x10000 -Wl,-e,_DriverEntry@8 -Wl,temp.exp -Wl,"-h vfatfs.sys" -specs=../../svc_specs -mdll -o $(TARGET).nostrip.sys vfat.o $(LIBS)
+	$(CC) -Wl,--image-base,0x10000 -Wl,-e,_DriverEntry@8 -Wl,temp.exp -Wl,"-h vfatfs.sys" -specs=../../svc_specs -mdll -o $(TARGET).sys.unstripped vfat.o $(LIBS)
 	- $(RM) temp.exp
+	$(NM) --numeric-sort $(TARGET).sys.unstripped >$(TARGET).sym
 
 
 $(TARGET).sys: $(OBJECTS) $(LIBS)
diff --git a/reactos/include/ddk/mmtypes.h b/reactos/include/ddk/mmtypes.h
index d35ea59c0db..94eab02eddd 100644
--- a/reactos/include/ddk/mmtypes.h
+++ b/reactos/include/ddk/mmtypes.h
@@ -1,4 +1,4 @@
-/* $Id: mmtypes.h,v 1.9 2000/07/07 10:30:54 dwelch Exp $ */
+/* $Id: mmtypes.h,v 1.10 2001/06/15 11:13:08 ekohl Exp $ */
 
 #ifndef _INCLUDE_DDK_MMTYPES_H
 #define _INCLUDE_DDK_MMTYPES_H
@@ -6,11 +6,11 @@
 #include <ntos/mm.h>
 
 #ifdef __NTOSKRNL__
-PVOID EXPORTED MmUserProbeAddress;
-PVOID EXPORTED MmHighestUserAddress;
+extern PVOID EXPORTED MmUserProbeAddress;
+extern PVOID EXPORTED MmHighestUserAddress;
 #else
-PVOID IMPORTED MmUserProbeAddress;
-PVOID IMPORTED MmHighestUserAddress;
+extern PVOID IMPORTED MmUserProbeAddress;
+extern PVOID IMPORTED MmHighestUserAddress;
 #endif
 
 #ifdef __NTOSKRNL__
diff --git a/reactos/lib/kernel32/file/volume.c b/reactos/lib/kernel32/file/volume.c
index fdb9e30c432..3317da3abef 100644
--- a/reactos/lib/kernel32/file/volume.c
+++ b/reactos/lib/kernel32/file/volume.c
@@ -1,4 +1,4 @@
-/* $Id: volume.c,v 1.19 2001/06/11 19:54:05 ekohl Exp $
+/* $Id: volume.c,v 1.20 2001/06/15 11:14:06 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -635,7 +635,7 @@ SetVolumeLabelW(LPCWSTR lpRootPathName,
 			       sizeof(FILE_FS_LABEL_INFORMATION) +
 			       LabelLength);
    LabelInfo->VolumeLabelLength = LabelLength;
-   wcscpy(&LabelInfo->VolumeLabel,
+   wcscpy(LabelInfo->VolumeLabel,
 	  lpVolumeName);
    
    hFile = CreateFileW(lpRootPathName,