diff --git a/lib/codegen/analysis/layout.cc b/lib/codegen/analysis/layout.cc
index 560198511..14b207eec 100644
--- a/lib/codegen/analysis/layout.cc
+++ b/lib/codegen/analysis/layout.cc
@@ -155,8 +155,8 @@ mma884_layout::mma884_layout(size_t num_warps,
   unsigned effective_num_warps = 1;
   for(size_t d = 0; d < shape.size(); d++)
     effective_num_warps *= wpt_[d];
-  if(num_warps != effective_num_warps)
-    throw std::runtime_error("cannot create a kernel with this amount of warps");
+//  if(num_warps != effective_num_warps)
+//    throw std::runtime_error("cannot create a kernel with this amount of warps");
 }
 
 
diff --git a/lib/lang/ast.cc b/lib/lang/ast.cc
index b6169b78f..7c43c78f4 100644
--- a/lib/lang/ast.cc
+++ b/lib/lang/ast.cc
@@ -835,11 +835,9 @@ ArithmType* ConditionalOp::Convert() {
 
 void ConditionalOp::TypeChecking() {
   auto condScalarType = TryExtractScalarType(this, cond_);
-
   if (!condScalarType) {
     Error(cond_->Tok(), "condition must be tile or scalar");
   }
-
   auto lhsType = TryExtractScalarType(this, exprTrue_);
   auto rhsType = TryExtractScalarType(this, exprFalse_);
   if (lhsType->ToArithm() && rhsType->ToArithm()) {
diff --git a/lib/lang/error.cc b/lib/lang/error.cc
index ddda6b6ce..3c2d8b339 100644
--- a/lib/lang/error.cc
+++ b/lib/lang/error.cc
@@ -62,7 +62,7 @@ static void VError(const SourceLocation& loc,
   fprintf(stderr, "\n    ");
   for (unsigned i = 1; i + nspaces < loc.column_; ++i)
     fputc(' ', stderr);
-  fprintf(stderr, ANSI_COLOR_GREEN "^\n");
+  fprintf(stderr, "^\n");
   exit(-1);
 }
 
diff --git a/lib/runtime/function.cc b/lib/runtime/function.cc
index cc3c395c7..fbff92a2e 100644
--- a/lib/runtime/function.cc
+++ b/lib/runtime/function.cc
@@ -395,7 +395,8 @@ std::string function::preheader() {
 #define __aligned(A)    __attribute__((aligned(A)))
 #define __multipleof(A) __attribute__((multipleof(A)))
 
-#define INFINITY bitcast<float>(0x7F800000)
+#define F32_INFINITY bitcast<float>(0x7F800000)
+#define F16_INFINITY bitcast<half>((int16)0x7C00)
 
 extern int atomic_cas(int*, int, int);
 extern int atomic_xchg(int*, int);
diff --git a/python/setup.py b/python/setup.py
index 293514da1..19794ee21 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -14,7 +14,7 @@ import distutils.spawn
 
 
 def find_llvm():
-    versions = ['','-9.0', '-9', '-90', '-8.0', '-8', '-80']
+    versions = ['-9.0', '-9', '-90', '-8.0', '-8', '-80', '']
     supported = ['llvm-config{v}'.format(v=v) for v in versions]
     paths = [distutils.spawn.find_executable(cfg) for cfg in supported]
     paths = [p for p in paths if p is not None]