diff --git a/src/main/java/com/amazon/redshift/core/v3/ConnectionFactoryImpl.java b/src/main/java/com/amazon/redshift/core/v3/ConnectionFactoryImpl.java
index d1b42e8..ffe65b5 100644
--- a/src/main/java/com/amazon/redshift/core/v3/ConnectionFactoryImpl.java
+++ b/src/main/java/com/amazon/redshift/core/v3/ConnectionFactoryImpl.java
@@ -412,7 +412,10 @@ else if(pluginName.equalsIgnoreCase(RedshiftConstants.IDP_TOKEN_PLUGIN))
       paramList.add(new String[]{"TimeZone", createRedshiftTimeZone()});
     }
 
-    paramList.add(new String[]{"_pq_.compression", info.getProperty("compression", RedshiftProperty.COMPRESSION.get(info))});
+    if(!("off".equalsIgnoreCase(RedshiftProperty.COMPRESSION.get(info))))
+    {
+      paramList.add(new String[]{"_pq_.compression", info.getProperty("compression", RedshiftProperty.COMPRESSION.get(info))});
+    }
 
     Version assumeVersion = ServerVersion.from(RedshiftProperty.ASSUME_MIN_SERVER_VERSION.get(info));
 
diff --git a/src/main/java/com/amazon/redshift/core/v3/QueryExecutorImpl.java b/src/main/java/com/amazon/redshift/core/v3/QueryExecutorImpl.java
index ad38372..fa883e3 100644
--- a/src/main/java/com/amazon/redshift/core/v3/QueryExecutorImpl.java
+++ b/src/main/java/com/amazon/redshift/core/v3/QueryExecutorImpl.java
@@ -324,7 +324,7 @@ private int updateQueryMode(int flags) {
     }
   }
 
-  public  void execute(Query query, ParameterList parameters, ResultHandler handler,
+  public void execute(Query query, ParameterList parameters, ResultHandler handler,
       int maxRows, int fetchSize, int flags) throws SQLException {
     // Wait for current ring buffer thread to finish, if any.
   	// Shouldn't call from synchronized method, which can cause dead-lock.