diff --git a/dotfiles/ssh/config b/dotfiles/ssh/config
index 37caa83..93f9c08 100644
--- a/dotfiles/ssh/config
+++ b/dotfiles/ssh/config
@@ -13,15 +13,15 @@ CanonicalizeFallbackLocal   yes
 CanonicalDomains            systemoverlord.com
 CanonicalizeMaxDots         0
 
-# Defaults (May be Overridden)
-Host *.*
-  CheckHostIP                 yes
-
 Host *.cloudshell.dev
   # Cloudshell hostnames are too long for unix sockets
   ControlMaster no
 
-Match canonical all
+Match exec "test -d \"$XDG_RUNTIME_DIR\" && mkdir -p $XDG_RUNTIME_DIR/sshsock" final
+  ControlPath ${XDG_RUNTIME_DIR}/sshsock/%C
+
+# Anything set earlier will take precedence, so these are defaults
+Match final
   CheckHostIP                 no
   ControlMaster               auto
   ControlPath                 ~/.ssh/master/%r@%h:%p
diff --git a/dotfiles/zshrc b/dotfiles/zshrc
index fedfd98..35f2e4d 100755
--- a/dotfiles/zshrc
+++ b/dotfiles/zshrc
@@ -51,6 +51,9 @@ bindkey -v
 ulimit -c unlimited
 
 DIRSTACKSIZE=16
+
+export OS="$(uname 2>/dev/null || echo "Unknown")"
+
 # Set terminal title
 case $TERM in
   xterm*|screen*)