diff --git a/GPy/__init__.py b/GPy/__init__.py
index 79204569..19246e8a 100644
--- a/GPy/__init__.py
+++ b/GPy/__init__.py
@@ -48,8 +48,8 @@ def load(file_or_path):
     """
     # This is the pickling pain when changing _src -> src
     import inspect
-    sys.modules['GPy.kern._src'] = kern.src
-    for name, module in inspect.getmembers(kern.src):
+    sys.modules['GPy.kern._src'] = kern.src  # @UndefinedVariable
+    for name, module in inspect.getmembers(kern.src):  # @UndefinedVariable
         if not name.startswith('_'):
             sys.modules['GPy.kern._src.{}'.format(name)] = module
     try:
@@ -60,7 +60,7 @@ def load(file_or_path):
         else:
             m = pickle.load(file_or_path)
     except: # python3
-        import pickle 
+        import pickle  # @Reimport
         if isinstance(file_or_path, str):
             with open(file_or_path, 'rb') as f:
                 u = pickle._Unpickler(f)  # @UndefinedVariable
diff --git a/MANIFEST.in b/MANIFEST.in
index 91f053cd..43687d8c 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,7 +1,18 @@
-recursive-include doc *.cfg
+# Documentation:
+include doc/source/conf.py
+include doc/source/index.rst
+include doc/source/tuto*.py
+
+# Data and config
 include *.json
+include GPy/defaults.cfg
+include GPy/installation.cfg
+
+# Cython
 recursive-include GPy *.c
 recursive-include GPy *.so
 recursive-include GPy *.pyx
+
+# Testing
 include GPy/testing/plotting_tests/baseline/*.png
 include GPy/testing/pickle_test.pickle