diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
index b375ce258a..7a5fd47648 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
@@ -422,15 +422,15 @@ public class CqlConfigHelper
             poolingOptions.setCoreConnectionsPerHost(HostDistance.LOCAL, coreConnections.get());
         if (maxConnections.isPresent())
             poolingOptions.setMaxConnectionsPerHost(HostDistance.LOCAL, maxConnections.get());
-        if (maxSimultaneousRequests.isPresent())
-            poolingOptions.setMaxSimultaneousRequestsPerConnectionThreshold(HostDistance.LOCAL, maxSimultaneousRequests.get());
         if (minSimultaneousRequests.isPresent())
             poolingOptions.setMinSimultaneousRequestsPerConnectionThreshold(HostDistance.LOCAL, minSimultaneousRequests.get());
+        if (maxSimultaneousRequests.isPresent())
+            poolingOptions.setMaxSimultaneousRequestsPerConnectionThreshold(HostDistance.LOCAL, maxSimultaneousRequests.get());
 
         poolingOptions.setCoreConnectionsPerHost(HostDistance.REMOTE, 0)
                       .setMaxConnectionsPerHost(HostDistance.REMOTE, 0)
-                      .setMaxSimultaneousRequestsPerConnectionThreshold(HostDistance.REMOTE, 0)
-                      .setMinSimultaneousRequestsPerConnectionThreshold(HostDistance.REMOTE, 0);
+                      .setMinSimultaneousRequestsPerConnectionThreshold(HostDistance.REMOTE, 0)
+                      .setMaxSimultaneousRequestsPerConnectionThreshold(HostDistance.REMOTE, 0);
 
         return poolingOptions;
     }  
@@ -518,6 +518,11 @@ public class CqlConfigHelper
                 liveRemoteHosts.add(host);
             }
 
+            @Override
+            public void onSuspected(Host host)
+            {
+            }
+
             @Override
             public HostDistance distance(Host host)
             {