diff --git a/src/DirManager.cpp b/src/DirManager.cpp
index 4c5dba5be..6fdc41213 100644
--- a/src/DirManager.cpp
+++ b/src/DirManager.cpp
@@ -1578,6 +1578,7 @@ _("Project check found %d orphan blockfile(s). These files are \
    }
 
    if (nResult != FSCKstatus_CLOSE_REQ)
+   if ((nResult != FSCKstatus_CLOSE_REQ) && !ODManager::HasLoadedODFlag())
    {
       // Remove any empty directories.
       ProgressDialog* pProgress = 
diff --git a/src/blockfile/ODDecodeBlockFile.cpp b/src/blockfile/ODDecodeBlockFile.cpp
index 93ebf3142..d1464234d 100644
--- a/src/blockfile/ODDecodeBlockFile.cpp
+++ b/src/blockfile/ODDecodeBlockFile.cpp
@@ -272,7 +272,8 @@ BlockFile *ODDecodeBlockFile::BuildFromXML(DirManager &dm, const wxChar **attrs)
    }
 
    return new ODDecodeBlockFile(summaryFileName, audioFileName,
-                                aliasStart, aliasLen, aliasChannel,decodeType);
+                                aliasStart, aliasLen, aliasChannel,decodeType,
+                                0,0,0, false);
 
 }
 
diff --git a/src/blockfile/ODPCMAliasBlockFile.cpp b/src/blockfile/ODPCMAliasBlockFile.cpp
index d3201bcf9..b513a74ad 100644
--- a/src/blockfile/ODPCMAliasBlockFile.cpp
+++ b/src/blockfile/ODPCMAliasBlockFile.cpp
@@ -339,7 +339,8 @@ BlockFile *ODPCMAliasBlockFile::BuildFromXML(DirManager &dm, const wxChar **attr
    }
 
    return new ODPCMAliasBlockFile(summaryFileName, aliasFileName,
-                                    aliasStart, aliasLen, aliasChannel);
+                                    aliasStart, aliasLen, aliasChannel,
+                                    0,0,0, false);
 }
 
 
@@ -406,7 +407,6 @@ void ODPCMAliasBlockFile::WriteSummary()
    char* fileNameChar = new char[strlen(sFullPath.mb_str(wxConvFile)) + 1];
    strcpy(fileNameChar, sFullPath.mb_str(wxConvFile));
    FILE* summaryFile = fopen(fileNameChar, "wb");
-   delete [] fileNameChar;
 
    mFileNameMutex.Unlock();
 
@@ -415,12 +415,11 @@ void ODPCMAliasBlockFile::WriteSummary()
       // Never silence the Log w.r.t write errors; they always count
       //however, this is going to be called from a non-main thread,
       //and wxLog calls are not thread safe.
-      printf("Unable to write summary data to file: ");// %s",
-      printf("test..\n");
-      printf(" filename: %s\n", fileNameChar);
-      mFileNameMutex.Unlock();
+      printf("Unable to write summary data to file: %s", fileNameChar);
+      delete [] fileNameChar;
       return;
    }
+   delete [] fileNameChar;
 
    // To build the summary data, call ReadData (implemented by the
    // derived classes) to get the sample data