diff --git a/lib/spack/spack/compiler.py b/lib/spack/spack/compiler.py
index e7d450ee8b..4ce6e3f11d 100644
--- a/lib/spack/spack/compiler.py
+++ b/lib/spack/spack/compiler.py
@@ -119,7 +119,7 @@ def check(exe):
         self.fc  = check(fc)
 
         self.spec = cspec
-        self.module = module
+        self.modules = modules.split()
 
 
 
diff --git a/lib/spack/spack/directives.py b/lib/spack/spack/directives.py
index 9297d6dac3..4bdc8772b8 100644
--- a/lib/spack/spack/directives.py
+++ b/lib/spack/spack/directives.py
@@ -252,7 +252,7 @@ def variant(pkg, name, default=False, description=""):
     """Define a variant for the package. Packager can specify a default
     value (on or off) as well as a text description."""
 
-    default     = bool(default)
+    default     = default
     description = str(description).strip()
 
     if not re.match(spack.spec.identifier_re, name):