diff --git a/plugins/cask/cask.load b/plugins/cask/cask.load
new file mode 100644
index 0000000..3701854
--- /dev/null
+++ b/plugins/cask/cask.load
@@ -0,0 +1 @@
+_prepend_path $HOME/.cask/bin
\ No newline at end of file
diff --git a/plugins/gvm/gvm.load b/plugins/gvm/gvm.load
index db881e7..198d02c 100644
--- a/plugins/gvm/gvm.load
+++ b/plugins/gvm/gvm.load
@@ -1,3 +1,30 @@
 for gvm_path in (find $HOME/.gvm/*/current/bin -maxdepth 0)
   _prepend_path $gvm_path
+  set -l module_info (echo $gvm_path | perl -ne 'm|(.*/.gvm/(\w+)/current)/bin| && print "$1 $2"')
+  set -l module_dir (echo $module_info | awk -F' ' '{print $1}')
+  set -l module_name (echo $module_info | awk -F' ' '{print $2}')
+  set -l module_home (echo $module_name | tr '[:lower:]' '[:upper:]')_HOME
+  set -gx "$module_home" $module_dir
 end
+
+# ONLY checked on OSX! Please add for other OS's...
+if test -z $JAVA_HOME
+  if test -f "/usr/libexec/java_home"
+    set -gx JAVA_HOME (/usr/libexec/java_home)
+  end
+
+  if test -z $JAVA_HOME
+    set -l java_homes "/Library/Java/Home" "/System/Library/Frameworks/JavaVM.framework/Home"
+    for file in $java_homes
+      if test -d $file
+        set -gx JAVA_HOME $file
+        break
+      end
+    end
+  end
+end
+
+if test -z $JAVA_HOME
+  echo "GVM: JAVA_HOME not set please set JAVA_HOME."
+end
+