diff --git a/build.gradle b/build.gradle
index a04d70c8..4c0beb11 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,7 +25,7 @@ dependencies {
 
     compile 'com.sun.jersey:jersey-core:1.11'
     compile 'com.sun.jersey:jersey-servlet:1.11'
-    compile 'org.slf4j:slf4j-api:1.6.4'
+    compile 'org.slf4j:slf4j-api:1.7.2'
     compile 'org.codehaus.jackson:jackson-core-asl:1.9.2'
     compile 'org.codehaus.jackson:jackson-mapper-asl:1.9.2'
     compile('com.netflix.eureka:eureka-client:1.1.22') {
@@ -35,8 +35,13 @@ dependencies {
     compile 'commons-lang:commons-lang:2.6'
     compile 'com.google.guava:guava:11.0.2'
     compile 'org.apache.httpcomponents:httpclient:4.3'
-    compile 'org.jclouds.driver:jclouds-jsch:1.6.0'
-    compile 'org.jclouds.api:ec2:1.6.0'
+    compile 'com.google.auto.service:auto-service:1.0-rc2'
+    compile 'org.apache.jclouds.driver:jclouds-jsch:1.9.0'
+    compile 'org.apache.jclouds.driver:jclouds-slf4j:1.9.0'
+    compile 'org.apache.jclouds.api:ec2:1.9.0'
+    compile 'org.apache.jclouds.provider:aws-ec2:1.9.0'
+    compile 'ch.qos.logback:logback-classic:1.0.13'
+
 
     testCompile 'org.testng:testng:6.3.1'
     testCompile 'org.mockito:mockito-core:1.8.5'
@@ -51,7 +56,7 @@ test {
 }
 
 tasks.withType(JavaCompile) {
-    options.compilerArgs << "-Xlint" << "-Werror"
+    options.compilerArgs << "-Xlint"
 }
 
 artifacts {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2d7affd9..27aab5c7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-bin.zip
diff --git a/src/main/java/com/netflix/simianarmy/chaos/SshConfig.java b/src/main/java/com/netflix/simianarmy/chaos/SshConfig.java
index 64163c4e..8eccb420 100644
--- a/src/main/java/com/netflix/simianarmy/chaos/SshConfig.java
+++ b/src/main/java/com/netflix/simianarmy/chaos/SshConfig.java
@@ -74,7 +74,7 @@ public SshConfig(MonkeyConfiguration config) {
         }
 
         if (privateKey == null) {
-            this.sshCredentials = null;
+        	   this.sshCredentials = LoginCredentials.builder().user(sshUser).build();
         } else {
             this.sshCredentials = LoginCredentials.builder().user(sshUser).privateKey(privateKey).build();
         }
diff --git a/src/main/java/com/netflix/simianarmy/client/aws/AWSClient.java b/src/main/java/com/netflix/simianarmy/client/aws/AWSClient.java
index baac755b..4ddb191d 100644
--- a/src/main/java/com/netflix/simianarmy/client/aws/AWSClient.java
+++ b/src/main/java/com/netflix/simianarmy/client/aws/AWSClient.java
@@ -88,6 +88,7 @@
 import org.jclouds.compute.domain.NodeMetadata;
 import org.jclouds.compute.domain.NodeMetadataBuilder;
 import org.jclouds.domain.LoginCredentials;
+import org.jclouds.ec2.EC2ApiMetadata;
 import org.jclouds.logging.slf4j.config.SLF4JLoggingModule;
 import org.jclouds.ssh.SshClient;
 import org.jclouds.ssh.jsch.config.JschSshClientModule;
@@ -725,7 +726,7 @@ public synchronized ComputeService getJcloudsComputeService() {
         if (jcloudsComputeService == null) {
             String username = awsCredentialsProvider.getCredentials().getAWSAccessKeyId();
             String password = awsCredentialsProvider.getCredentials().getAWSSecretKey();
-            ComputeServiceContext jcloudsContext = ContextBuilder.newBuilder("ec2").credentials(username, password)
+            ComputeServiceContext jcloudsContext = ContextBuilder.newBuilder("aws-ec2").credentials(username, password)
                     .modules(ImmutableSet.<Module>of(new SLF4JLoggingModule(), new JschSshClientModule()))
                     .buildView(ComputeServiceContext.class);
 
@@ -750,7 +751,7 @@ public SshClient connectSsh(String instanceId, LoginCredentials credentials) {
 
         node = NodeMetadataBuilder.fromNodeMetadata(node).credentials(credentials).build();
 
-        Utils utils = computeService.getContext().getUtils();
+        Utils utils = computeService.getContext().utils();
         SshClient ssh = utils.sshForNode().apply(node);
 
         ssh.connect();