diff --git a/lib/git/aliases.sh b/lib/git/aliases.sh
index 562022b..80139f0 100644
--- a/lib/git/aliases.sh
+++ b/lib/git/aliases.sh
@@ -65,7 +65,7 @@ _git
 __git_alias () {
   if [ -n "$1" ]; then
     local alias_str cmd_prefix cmd cmd_args
-    alias_str="$1"; cmd_prefix="$2"; cmd="$3"; cmd_args=("${@:3}")
+    alias_str="$1"; cmd_prefix="$2"; cmd="$3"; cmd_args=("${@:4}")
     alias $alias_str="$cmd_prefix $cmd${cmd_args:+ }${cmd_args[*]}"
     if [ "$shell" = "bash" ]; then
       __define_git_completion "$alias_str" "$cmd"
diff --git a/lib/git/shell_shortcuts.sh b/lib/git/shell_shortcuts.sh
index 2388290..26a9ff4 100644
--- a/lib/git/shell_shortcuts.sh
+++ b/lib/git/shell_shortcuts.sh
@@ -108,7 +108,7 @@ fi
 
 # Function wrapper around 'll'
 # Adds numbered shortcuts to output of ls -l, just like 'git status'
-if [ "$shell_ls_aliases_enabled" = "true" ]; then
+if [ "$shell_ls_aliases_enabled" = "true" ] && which ruby > /dev/null 2>&1; then
   unalias ll > /dev/null 2>&1; unset -f ll > /dev/null 2>&1
   function ls_with_file_shortcuts {
     local ll_output