diff --git a/src/calibre/ebooks/epub/__init__.py b/src/calibre/ebooks/epub/__init__.py
index aa17024d50..ecea8d98f6 100644
--- a/src/calibre/ebooks/epub/__init__.py
+++ b/src/calibre/ebooks/epub/__init__.py
@@ -196,8 +196,8 @@ to auto-generate a Table of Contents.
                'an overview of the NCX format.'))
     toc('use_auto_toc', ['--use-auto-toc'], default=False,
         help=_('Normally, if the source file already has a Table of Contents, '
-               'it is used in preference to the autodetected one. '
-               'With this option, the autodetected one is always used.'))
+               'it is used in preference to the auto-generated one. '
+               'With this option, the auto-generated one is always used.'))
     
     layout = c.add_group('page layout', _('Control page layout'))
     layout('margin_top', ['--margin-top'], default=5.0, 
diff --git a/src/calibre/gui2/add.py b/src/calibre/gui2/add.py
index a1a4607525..b44449d1aa 100644
--- a/src/calibre/gui2/add.py
+++ b/src/calibre/gui2/add.py
@@ -46,7 +46,6 @@ class AddFiles(Add):
     
     def metadata_delivered(self, id, mi):
         if self.is_canceled():
-            self.reading.wakeAll()
             return
         if not mi.title:
             mi.title = os.path.splitext(self.names[id])[0]
@@ -163,7 +162,6 @@ class AddRecursive(Add):
     
     def metadata_delivered(self, id, mi):
         if self.is_canceled():
-            self.reading.wakeAll()
             return
         self.emit(SIGNAL('processed(PyQt_PyObject,PyQt_PyObject)'),
                           mi.title, id)