diff --git a/ci/install_pyHealpix.sh b/ci/install_pyHealpix.sh
index 914d0c1d1b7dba1694b5a6d08e446fd576e9f9ed..dbadaf814184c3bd2260435460c237117b4dd552 100644
--- a/ci/install_pyHealpix.sh
+++ b/ci/install_pyHealpix.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
 git clone https://gitlab.mpcdf.mpg.de/ift/pyHealpix.git
-(cd pyHealpix && autoreconf -i && ./configure --enable-openmp --enable-native-optimizations && make -j4 install)
+(cd pyHealpix && autoreconf -i && ./configure --enable-openmp && make -j4 install)
 rm -rf pyHealpix
diff --git a/nifty/operators/fft_operator/transformations/gllmtransformation.py b/nifty/operators/fft_operator/transformations/gllmtransformation.py
index 9061ce627a5c972eb74628596c3ae64125d30b92..87501c8a6c730cfd192d0e60b3ea3889f4bf0901 100644
--- a/nifty/operators/fft_operator/transformations/gllmtransformation.py
+++ b/nifty/operators/fft_operator/transformations/gllmtransformation.py
@@ -37,7 +37,7 @@ class GLLMTransformation(SlicingTransformation):
         if module != 'pyHealpix':
             raise ValueError("Unsupported SHT module.")
 
-        if 'pyHealpix' not in gdi:
+        if pyHealpix is None:
             raise ImportError(
                 "The module pyHealpix is needed but not available.")
 
diff --git a/nifty/operators/fft_operator/transformations/hplmtransformation.py b/nifty/operators/fft_operator/transformations/hplmtransformation.py
index a416934c8675839833c0490cb5037caa7b682297..76ad8df642729f65d8c0289cf5f89e8c5c196535 100644
--- a/nifty/operators/fft_operator/transformations/hplmtransformation.py
+++ b/nifty/operators/fft_operator/transformations/hplmtransformation.py
@@ -38,7 +38,7 @@ class HPLMTransformation(SlicingTransformation):
         if module != 'pyHealpix':
             raise ValueError("Unsupported SHT module.")
 
-        if 'pyHealpix' not in gdi:
+        if pyHealpix is None:
             raise ImportError(
                 "The module pyHealpix is needed but not available")
 
diff --git a/nifty/operators/fft_operator/transformations/lmgltransformation.py b/nifty/operators/fft_operator/transformations/lmgltransformation.py
index d153e37f751810b85671aaa55988211614cb4ded..2433bb05bbf8fa0a34a5430ed5ec54aad1f36ded 100644
--- a/nifty/operators/fft_operator/transformations/lmgltransformation.py
+++ b/nifty/operators/fft_operator/transformations/lmgltransformation.py
@@ -37,7 +37,7 @@ class LMGLTransformation(SlicingTransformation):
         if module != 'pyHealpix':
             raise ValueError("Unsupported SHT module.")
 
-        if 'pyHealpix' not in gdi:
+        if pyHealpix is None:
             raise ImportError(
                 "The module pyHealpix is needed but not available.")
 
diff --git a/nifty/operators/fft_operator/transformations/lmhptransformation.py b/nifty/operators/fft_operator/transformations/lmhptransformation.py
index c4952b113d0d6e7418196b7fc453283c425f7109..bbff4147cba3cc0efe64475c312f3bddc2083b0a 100644
--- a/nifty/operators/fft_operator/transformations/lmhptransformation.py
+++ b/nifty/operators/fft_operator/transformations/lmhptransformation.py
@@ -36,7 +36,7 @@ class LMHPTransformation(SlicingTransformation):
         if module != 'pyHealpix':
             raise ValueError("Unsupported SHT module.")
 
-        if gdi.get('pyHealpix') is None:
+        if pyHealpix is None:
             raise ImportError(
                 "The module pyHealpix is needed but not available.")
 
diff --git a/nifty/plotting/plots/heatmaps/glmollweide.py b/nifty/plotting/plots/heatmaps/glmollweide.py
index 7f4d69d82f780074e85a518ba48fe93d2e3d0de6..c7342f8160062617d1f19ec0802320bae8b44fe1 100644
--- a/nifty/plotting/plots/heatmaps/glmollweide.py
+++ b/nifty/plotting/plots/heatmaps/glmollweide.py
@@ -13,7 +13,7 @@ class GLMollweide(Heatmap):
     def __init__(self, data, xsize=800, color_map=None,
                  webgl=False, smoothing=False):
         # smoothing 'best', 'fast', False
-        if 'pyHealpix' not in gdi:
+        if pyHealpix is None:
             raise ImportError(
                 "The module pyHealpix is needed but not available.")
         self.xsize = xsize
diff --git a/nifty/plotting/plots/heatmaps/hpmollweide.py b/nifty/plotting/plots/heatmaps/hpmollweide.py
index 71cefbcda7eeb2651ed0c430bf7e8b79832db036..86e38202296d90653650654b897e9c04ff179e9e 100644
--- a/nifty/plotting/plots/heatmaps/hpmollweide.py
+++ b/nifty/plotting/plots/heatmaps/hpmollweide.py
@@ -12,7 +12,7 @@ pyHealpix = gdi.get('pyHealpix')
 class HPMollweide(Heatmap):
     def __init__(self, data, xsize=800, color_map=None, webgl=False,
                  smoothing=False):  # smoothing 'best', 'fast', False
-        if 'pyHealpix' not in gdi:
+        if pyHealpix is None:
             raise ImportError(
                 "The module pyHealpix is needed but not available.")
         self.xsize = xsize
diff --git a/nifty/plotting/plotter/plotter_base.py b/nifty/plotting/plotter/plotter_base.py
index 18b545cee0b7d1fcf3c81212df524c48a8d41dbe..456f094057a84c9482db74ee41b8e6564e02c7e3 100644
--- a/nifty/plotting/plotter/plotter_base.py
+++ b/nifty/plotting/plotter/plotter_base.py
@@ -31,7 +31,7 @@ class PlotterBase(Loggable, object):
     __metaclass__ = abc.ABCMeta
 
     def __init__(self, interactive=False, path='.', title=""):
-        if 'plotly' not in gdi:
+        if plotly is None:
             raise ImportError("The module plotly is needed but not available.")
         self.interactive = interactive
         self.path = path
diff --git a/nifty/spaces/gl_space/gl_space.py b/nifty/spaces/gl_space/gl_space.py
index 0f1168f90af5f8435fce50c06a93f8f4f0324685..e647947922eb80fc4819781abee78f38dac1d3b3 100644
--- a/nifty/spaces/gl_space/gl_space.py
+++ b/nifty/spaces/gl_space/gl_space.py
@@ -45,7 +45,7 @@ class GLSpace(Space):
             Number of latitudinal bins (or rings) that are used for this
             pixelization.
         nlon : int, *optional*
-            Number of longditudinal bins that are used for this pixelization.
+            Number of longitudinal bins that are used for this pixelization.
 
         Attributes
         ----------
@@ -57,7 +57,7 @@ class GLSpace(Space):
             Number of latitudinal bins (or rings) that are used for this
             pixelization.
         nlon : int
-            Number of longditudinal bins that are used for this pixelization.
+            Number of longitudinal bins that are used for this pixelization.
         total_volume : np.float
             The total volume of the space.
         shape : tuple of np.ints
@@ -89,7 +89,7 @@ class GLSpace(Space):
     # ---Overwritten properties and methods---
 
     def __init__(self, nlat, nlon=None):
-        if 'pyHealpix' not in gdi:
+        if pyHealpix is None:
             raise ImportError(
                 "The module pyHealpix is needed but not available.")
 
@@ -163,7 +163,7 @@ class GLSpace(Space):
 
     @property
     def nlon(self):
-        """ Number of longditudinal bins that are used for this pixelization.
+        """ Number of longitudinal bins that are used for this pixelization.
         """
 
         return self._nlon