diff --git a/asterixdb/asterix-benchmark/src/main/resources/ansible/runquery.yml b/asterixdb/asterix-benchmark/src/main/resources/ansible/runquery.yml
index ef3c2a5..a8af486 100644
--- a/asterixdb/asterix-benchmark/src/main/resources/ansible/runquery.yml
+++ b/asterixdb/asterix-benchmark/src/main/resources/ansible/runquery.yml
@@ -34,6 +34,8 @@
         url: "{{ service }}"
         method: POST
         body: "{{ lookup('file', query_file ) }}"
+        headers:
+          Content-Type: "text/plain"
         timeout: 3600
       register: response
 
diff --git a/asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/setup/create.sqlpp b/asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/setup/create.sqlpp
index 2aa67c6..799f445 100644
--- a/asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/setup/create.sqlpp
+++ b/asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/setup/create.sqlpp
@@ -34,7 +34,7 @@
   l_shipinstruct: string,
   l_shipmode: string,
   l_comment: string
-}
+};
 
 create type OrderType as {
   o_orderkey: int64,
@@ -46,7 +46,7 @@
   o_clerk: string,
   o_shippriority: int32,
   o_comment: string
-}
+};
 
 create type CustomerType as {
   c_custkey: int64,
@@ -57,7 +57,7 @@
   c_acctbal: double,
   c_mktsegment: string,
   c_comment: string
-}
+};
 
 create type PartType as {
   p_partkey: int64,
@@ -69,7 +69,7 @@
   p_container: string,
   p_retailprice: double,
   p_comment: string
-}
+};
 
 create type PartSuppType as {
   ps_partkey: int64,
@@ -77,7 +77,7 @@
   ps_availqty: int32,
   ps_supplycost: double,
   ps_comment: string
-}
+};
 
 create type SupplierType as {
   s_suppkey: int64,
@@ -87,20 +87,20 @@
   s_phone: string,
   s_acctbal: double,
   s_comment: string
-}
+};
 
 create type NationType as {
   n_nationkey: int32,
   n_name: string,
   n_regionkey: int32,
   n_comment: string
-}
+};
 
 create type RegionType as {
   r_regionkey: int32,
   r_name: string,
   r_comment: string
-}
+};
 
 create dataset LineItem(LineItemType) primary key l_orderkey, l_linenumber;
 create dataset Orders(OrderType)      primary key o_orderkey;
diff --git a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServerHandler.java b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServerHandler.java
index e89ed56..46b693b 100644
--- a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServerHandler.java
+++ b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServerHandler.java
@@ -72,7 +72,7 @@
             }
         } catch (Exception e) {
             LOGGER.log(Level.SEVERE, "Failure Submitting HTTP Request", e);
-            respond(ctx, request.protocolVersion(), HttpResponseStatus.INTERNAL_SERVER_ERROR);
+            respond(ctx, request.protocolVersion(), new HttpResponseStatus(500, e.getMessage()));
         }
     }