diff --git a/lib/spack/spack/relocate.py b/lib/spack/spack/relocate.py
index fc653e825dc..8277cca0680 100644
--- a/lib/spack/spack/relocate.py
+++ b/lib/spack/spack/relocate.py
@@ -594,4 +594,6 @@ def mime_type(file):
     file_cmd = Executable('file')
     output = file_cmd('-b', '-h', '--mime-type', file, output=str, error=str)
     tty.debug('[MIME_TYPE] {0} -> {1}'.format(file, output.strip()))
+    if '/' not in output:
+        output += '/'
     return tuple(output.strip().split('/'))
diff --git a/var/spack/repos/builtin/packages/libxpm/package.py b/var/spack/repos/builtin/packages/libxpm/package.py
index 7cc339f92c6..e4ae82710a0 100644
--- a/var/spack/repos/builtin/packages/libxpm/package.py
+++ b/var/spack/repos/builtin/packages/libxpm/package.py
@@ -26,6 +26,6 @@ class Libxpm(AutotoolsPackage):
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 
-    def setup_environment(self, spack_env, run_env):
-        spack_env.append_flags('LDFLAGS', '-L{0} -lintl'.format(
-            self.spec['gettext'].prefix.lib))
+#    def setup_environment(self, spack_env, run_env):
+#        spack_env.append_flags('LDFLAGS', '-L{0} -lintl'.format(
+#            self.spec['gettext'].prefix.lib))
diff --git a/var/spack/repos/builtin/packages/root/package.py b/var/spack/repos/builtin/packages/root/package.py
index f8d7f82791e..cd5f7500a24 100644
--- a/var/spack/repos/builtin/packages/root/package.py
+++ b/var/spack/repos/builtin/packages/root/package.py
@@ -501,12 +501,10 @@ def cmake_args(self):
                 self.spec['ftgl'].prefix))
             options.append('-DFTGL_INCLUDE_DIR={0}'.format(
                 self.spec['ftgl'].prefix.include))
-
         # see https://github.com/spack/spack/pull/11579
         if '+python' in self.spec:
             options.append('-DPYTHON_EXECUTABLE=%s' %
                            spec['python'].command.path)
-
         return options
 
     def setup_environment(self, spack_env, run_env):