diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/RecordingCluster.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/RecordingCluster.java
index 2fdedc3dc..6a9697e75 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/RecordingCluster.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/RecordingCluster.java
@@ -16,17 +16,17 @@
 
 package com.palantir.docker.compose;
 
-import com.google.common.collect.Sets;
 import com.palantir.docker.compose.connection.Cluster;
 import com.palantir.docker.compose.connection.Container;
 import com.palantir.docker.compose.connection.ContainerCache;
 import java.io.IOException;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 
 final class RecordingCluster extends Cluster {
     private final Cluster delegate;
-    private final Set<String> recordedContainerNames = Sets.newConcurrentHashSet();
+    private final Set<String> recordedContainerNames = ConcurrentHashMap.newKeySet();
 
     RecordingCluster(Cluster delegate) {
         this.delegate = delegate;
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerComposeExecutable.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerComposeExecutable.java
index 6a71fe293..fdd653fe4 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerComposeExecutable.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerComposeExecutable.java
@@ -32,7 +32,8 @@ public abstract class DockerComposeExecutable implements Executable {
     private static final DockerCommandLocations DOCKER_COMPOSE_LOCATIONS = new DockerCommandLocations(
             System.getenv("DOCKER_COMPOSE_LOCATION"),
             "/usr/local/bin/docker-compose",
-            "/usr/bin/docker-compose"
+            "/usr/bin/docker-compose",
+            "/Program Files/Docker/Docker/resources/bin/docker-compose.exe"
     );
 
     private static String defaultDockerComposePath() {
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerExecutable.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerExecutable.java
index 1b47443ec..386c0ae8c 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerExecutable.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerExecutable.java
@@ -29,7 +29,8 @@ public abstract class DockerExecutable implements Executable {
     private static final DockerCommandLocations DOCKER_LOCATIONS = new DockerCommandLocations(
             System.getenv("DOCKER_LOCATION"),
             "/usr/local/bin/docker",
-            "/usr/bin/docker"
+            "/usr/bin/docker",
+            "/Program Files/Docker/Docker/resources/bin/docker.exe"
     );
 
     @Value.Parameter protected abstract DockerConfiguration dockerConfiguration();