diff --git a/minerva/cluster.py b/minerva/cluster.py
index c813fcb..cc8d971 100644
--- a/minerva/cluster.py
+++ b/minerva/cluster.py
@@ -62,9 +62,9 @@ class Cluster:
 
     # Start the dask processes necessary for cluster communication
     def start_dask(self):
-        self.scheduler.cmd("dask scheduler", disown=True)
+        self.scheduler.cmd("dask-scheduler", disown=True)
         for w in self.workers:
-            w.cmd(f"dask worker {self.scheduler.private_ip}:8786", disown=True)
+            w.cmd(f"dask-worker {self.scheduler.private_ip}:8786", disown=True)
 
 
     def terminate(self):
diff --git a/minerva/machine.py b/minerva/machine.py
index 69154c8..13391fd 100644
--- a/minerva/machine.py
+++ b/minerva/machine.py
@@ -115,7 +115,8 @@ class Machine:
 
         print(f"\t{self.name} ({self.info['InstanceId']}) => {self.public_ip} ({self.private_ip})")
 
-        self.ssh = Connection(self.public_ip,
+        ip = self.public_ip or self.private_ip
+        self.ssh = Connection(ip,
                               self.username,
                               connect_kwargs = {
                                   "key_filename": self.pier.key_path
diff --git a/pyproject.toml b/pyproject.toml
index 340dc58..458f1f9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "minerva"
-version = "0.6.3"
+version = "0.6.4"
 description = "Easier access to AWS Athena and Redshift"
 authors = [
   "Ari Brown <ari@airintech.com>",