diff --git a/debugger/hash.c b/debugger/hash.c
index ffb4d6f3dfb..19f2a77cf0a 100644
--- a/debugger/hash.c
+++ b/debugger/hash.c
@@ -880,6 +880,8 @@ void DEBUG_LoadEntryPoints(void)
     for (ok = ModuleFirst(&entry); ok; ok = ModuleNext(&entry))
     {
         if (!(pModule = NE_GetPtr( entry.hModule ))) continue;
+        if (!(pModule->flags & NE_FFLAGS_WIN32))  /* NE module */
+	  {
 	if ((rowcount + strlen(entry.szModule)) > 76)
         {
 	    fprintf( stderr,"\n   ");
@@ -888,8 +890,8 @@ void DEBUG_LoadEntryPoints(void)
         fprintf( stderr, " %s", entry.szModule );
         rowcount += strlen(entry.szModule) + 1;
 
-        if (!(pModule->flags & NE_FFLAGS_WIN32))  /* NE module */
             DEBUG_LoadEntryPoints16( entry.hModule, pModule, entry.szModule );
+	  }
     }
     for (wm=PROCESS_Current()->modref_list;wm;wm=wm->next)
     {
diff --git a/debugger/msc.c b/debugger/msc.c
index 3be941deeed..35d5590e160 100644
--- a/debugger/msc.c
+++ b/debugger/msc.c
@@ -2302,6 +2302,7 @@ DEBUG_ProcessDeferredDebug()
   struct MiscDebug	     * misc;
   char			     * filename;
   int			       last_proc = -1;
+  int                          need_print =0;
 
   DEBUG_InitCVDataTypes();
 
@@ -2314,6 +2315,11 @@ DEBUG_ProcessDeferredDebug()
 
       if( last_proc != deefer->dbg_index )
 	{
+	  if (!need_print)
+	    {
+	      fprintf(stderr, "DeferredDebug for:");
+	      need_print=1;
+	    }
 	  fprintf(stderr, " %s",deefer->module_name);
 	  last_proc = deefer->dbg_index;
 	}
@@ -2384,6 +2390,8 @@ DEBUG_ProcessDeferredDebug()
 	  break;
 	}
     }
+      if(need_print)
+       fprintf(stderr, "\n");
   return TRUE;
 
 }