diff --git a/module.cpp b/module.cpp
index 24c8b7a0..562a7f5c 100644
--- a/module.cpp
+++ b/module.cpp
@@ -2418,8 +2418,15 @@ Module::CompileAndOutput(const char *srcFile,
                 const char *isaName = g->target->GetISAString();
                 std::string targetHeaderFileName = 
                     lGetTargetFileName(headerFileName, isaName);
-                if (!m->writeOutput(Module::Header, targetHeaderFileName.c_str()))
+                if (i == 0) {
+                    // write out a header w/o target name for the first target only
+                    if (!m->writeOutput(Module::Header, headerFileName)) {
+                        return 1;
+                    }
+                }
+                if (!m->writeOutput(Module::Header, targetHeaderFileName.c_str())) {
                     return 1;
+                }
             }
 
             delete g->target;
diff --git a/type.cpp b/type.cpp
index 104dff69..22e6b029 100644
--- a/type.cpp
+++ b/type.cpp
@@ -461,7 +461,7 @@ AtomicType::GetCDeclaration(const std::string &name) const {
         char buf[32];
 		// get program count
         int vWidth = (variability == Variability::Varying) ? 
-                        g->target->getNativeVectorWidth() :
+                        g->target->getVectorWidth() :
                         variability.soaWidth;
         sprintf(buf, "[%d]", vWidth);
         ret += buf;
@@ -755,8 +755,7 @@ EnumType::Mangle() const {
 
 std::string
 EnumType::GetCDeclaration(const std::string &varName) const {
-    if (variability != Variability::Uniform &&
-        variability != Variability::SOA) {
+    if (variability == Variability::Unbound) {
         Assert(m->errorCount > 0);
         return "";
     }
@@ -772,9 +771,13 @@ EnumType::GetCDeclaration(const std::string &varName) const {
         ret += varName;
     }
 
-    if (variability == Variability::SOA) {
+    if (variability == Variability::SOA ||
+        variability == Variability::Varying) {
+        int vWidth = (variability == Variability::Varying) ?
+            g->target->getVectorWidth() :
+            variability.soaWidth;
         char buf[32];
-        sprintf(buf, "[%d]", variability.soaWidth);
+        sprintf(buf, "[%d]", vWidth);
         ret += buf;
     }
 
@@ -1081,8 +1084,7 @@ PointerType::Mangle() const {
 std::string
 PointerType::GetCDeclaration(const std::string &name) const {
     if (isSlice ||
-        (variability != Variability::Uniform &&
-         variability != Variability::SOA)) {
+        (variability == Variability::Unbound)) {
         Assert(m->errorCount > 0);
         return "";
     }
@@ -1098,9 +1100,13 @@ PointerType::GetCDeclaration(const std::string &name) const {
     ret += std::string(" ");
     ret += name;
 
-    if (variability == Variability::SOA) {
+    if (variability == Variability::SOA ||
+        variability == Variability::Varying) {
+        int vWidth = (variability == Variability::Varying) ?
+            g->target->getVectorWidth() :
+            variability.soaWidth;
         char buf[32];
-        sprintf(buf, "[%d]", variability.soaWidth);
+        sprintf(buf, "[%d]", vWidth);
         ret += buf;
     }
 
@@ -1426,7 +1432,7 @@ ArrayType::GetCDeclaration(const std::string &name) const {
     }
 
     int soaWidth = base->GetSOAWidth();
-    int vWidth = (base->IsVaryingType()) ? g->target->getNativeVectorWidth() : 0;
+    int vWidth = (base->IsVaryingType()) ? g->target->getVectorWidth() : 0;
     base = base->GetAsUniformType();
 
     std::string s = base->GetCDeclaration(name);