diff --git a/src/calibre/linux.py b/src/calibre/linux.py
index a9a5556afa..34f7abb195 100644
--- a/src/calibre/linux.py
+++ b/src/calibre/linux.py
@@ -23,7 +23,6 @@ entry_points = {
              'calibre-server     = calibre.library.server:main',
              'lrf2lrs            = calibre.ebooks.lrf.lrfparser:main',
              'lrs2lrf            = calibre.ebooks.lrf.lrs.convert_from:main',
-             'isbndb             = calibre.ebooks.metadata.isbndb:main',
              'librarything       = calibre.ebooks.metadata.library_thing:main',
              'calibre-debug      = calibre.debug:main',
              'calibredb          = calibre.library.cli:main',
diff --git a/src/calibre/utils/ipc/server.py b/src/calibre/utils/ipc/server.py
index 25f6c49183..70f77d7122 100644
--- a/src/calibre/utils/ipc/server.py
+++ b/src/calibre/utils/ipc/server.py
@@ -11,12 +11,12 @@ from math import ceil
 from threading import Thread, RLock
 from Queue import Queue, Empty
 from multiprocessing.connection import Listener
-from multiprocessing import cpu_count
 from collections import deque
 from binascii import hexlify
 
 from calibre.utils.ipc.launch import Worker
 from calibre.utils.ipc.worker import PARALLEL_FUNCS
+from calibre import detect_ncpus as cpu_count
 
 _counter = 0