diff --git a/dmd/module.c b/dmd/module.c
index 83fe9d1c..deb89b6f 100644
--- a/dmd/module.c
+++ b/dmd/module.c
@@ -157,7 +157,7 @@ Module::Module(char *filename, Identifier *ident, int doDocComment, int doHdrGen
     this->doDocComment = doDocComment;
     this->doHdrGen = doHdrGen;
     this->isRoot = false;
-    this->arrayfuncs = 0;
+    //this->arrayfuncs = 0;
 #endif
 }
 
diff --git a/dmd/mtype.h b/dmd/mtype.h
index e7e98b16..88844bdc 100644
--- a/dmd/mtype.h
+++ b/dmd/mtype.h
@@ -106,8 +106,8 @@ enum TY
     Ttuple,
     Tslice,
     Treturn,
-    Tnull,
-    TMAX
+    TMAX,
+    Tnull
 };
 
 #define Tascii Tchar
diff --git a/ir/irtype.cpp b/ir/irtype.cpp
index ef9aa02a..37d31ecd 100644
--- a/ir/irtype.cpp
+++ b/ir/irtype.cpp
@@ -22,7 +22,7 @@ IrType::IrType(Type* dt, LLType* lt)
 {
     assert(dt && "null D Type");
     assert(lt && "null LLVM Type");
-#if !DMDV2
+#if 0
     // FIXME: For some reason the assert fails
     assert(dt->irtype == NULL && "already has IrType");
 #endif