diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
index 6eafc6093..881057853 100644
--- a/plugins/battery/battery.plugin.zsh
+++ b/plugins/battery/battery.plugin.zsh
@@ -1,4 +1,4 @@
-if [[ $(acpi | grep -c '^Battery.*Discharging') -gt 0 ]] ; then
+if [[ $(acpi 2&>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]] ; then
   function battery_pct_remaining() { echo "$(acpi | cut -f2 -d ',' | tr -cd '[:digit:]')" }
   function battery_time_remaining() { echo $(acpi | cut -f3 -d ',') }
   function battery_pct_prompt() { 
diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh
index d82d028f7..705097ab3 100644
--- a/plugins/rbenv/rbenv.plugin.zsh
+++ b/plugins/rbenv/rbenv.plugin.zsh
@@ -6,8 +6,13 @@ if [ -d $rbenvdir ] ; then
   alias rubies="rbenv versions"
   alias gemsets="rbenv gemset list"
 
-  current_ruby=$(rbenv version | cut -f1 -d ' ')
-  current_gemset=$($benv gemset active 2&>/dev/null | grep -v 'no active gemsets')
+  function current_ruby() {
+    echo "$(rbenv version | cut -f1 -d ' ')"
+  }
+
+  function current_gemset() {
+    echo "$(rbenv gemset active 2&>/dev/null | grep -v 'no active gemsets')"
+  }
 
   function gems {
     local rbenv_path=$(rbenv prefix)
@@ -19,10 +24,10 @@ if [ -d $rbenvdir ] ; then
   }
 
   function rbenv_prompt_info() {
-    if [[ -n $current_gemset ]] ; then
-      echo "${current_ruby}@${current_gemset}"
+    if [[ -n $(current_gemset) ]] ; then
+      echo "$(current_ruby)@$(current_gemset)"
     else
-      echo "${current_ruby}"
+      echo "$(current_ruby)"
     fi
   }
 else