--- a/harvester/monitorplugins/mdsfileserverplugin/src/mdsfileserverplugin.cpp	Wed Sep 15 12:40:59 2010 +0300
+++ b/harvester/monitorplugins/mdsfileserverplugin/src/mdsfileserverplugin.cpp	Wed Oct 13 15:02:02 2010 +0300
@@ -339,7 +339,6 @@
             		  {
             			fileEventType = EMdsFileCreated;
             			delete iCreatedFiles[i];
-            			iCreatedFiles[i] = NULL;
             			iCreatedFiles.Remove( i );
             			
 						//Have to check whether file has been hidden          			
@@ -434,7 +433,6 @@
                     if ( MdsUtils::Compare( iFileName, *(iModifiedFiles[i]) ) == 0 )
                       {
                         delete iModifiedFiles[i];
-                        iModifiedFiles[i] = NULL;
                         iModifiedFiles.Remove( i );
                         found = ETrue;
                         }
@@ -497,7 +495,7 @@
 				{
 				return KErrNone;
 				}
-			drvNumber = iFormatOldMediaId;
+			drvNumber = iFormatDriveNumber;
 			volInfo.iUniqueID = iFormatOldMediaId;
 			iFormatOldMediaId = 0;
 			iFormatDriveNumber = -1;
@@ -546,7 +544,7 @@
             queueItem->iFileEventType = fileEventType;
             queueItem->iProcessId = processId;
 
-            iQueue.AppendL( queueItem ); // owenership is transferred
+            iQueue.AppendL( queueItem ); // ownership is transferred
             CleanupStack::Pop( queueItem );
             err = KErrNone;
             iPendingEvents++;