diff --git a/GPy/core/model.py b/GPy/core/model.py
index a0628c42..c62037a6 100644
--- a/GPy/core/model.py
+++ b/GPy/core/model.py
@@ -10,7 +10,7 @@ from parameterised import parameterised, truncate_pad
 import priors
 from ..util.linalg import jitchol
 from ..inference import optimization
-from .. import likelihoods
+from ..likelihoods import EP
 
 class model(parameterised):
     def __init__(self):
@@ -402,7 +402,7 @@ class model(parameterised):
         :type optimzer: string TODO: valid strings?
 
         """
-        assert isinstance(self.likelihood,likelihoods.EP), "EM is not available for Gaussian likelihoods"
+        assert isinstance(self.likelihood,EP), "EM is not available for Gaussian likelihoods"
         log_change = epsilon + 1.
         self.log_likelihood_record = []
         self.gp_params_record = []
diff --git a/doc/conf.py b/doc/conf.py
index 63070df2..03a941ff 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -38,10 +38,10 @@ except ImportError:
     print "no sphinx"
 
 APP_DIR = os.path.normpath(os.path.join(os.getcwd(), '../'))
-PACKAGE_DIR1 = os.path.normpath(os.path.join(os.getcwd(), '../'))
+#PACKAGE_DIR1 = os.path.normpath(os.path.join(os.getcwd(), '../'))
 sys.path.insert(0, APP_DIR)
-sys.path.insert(0, PACKAGE_DIR1)
-sys.path.insert(0, os.path.abspath('../GPy'))
+#sys.path.insert(0, PACKAGE_DIR1)
+#sys.path.insert(0, os.path.abspath('../GPy'))
 print "sys.path:", sys.path
 
 #sys.path.insert(0, os.getcwd() + "/..")