diff --git a/manifests/peer.pp b/manifests/peer.pp
index 028cd30..51abe07 100644
--- a/manifests/peer.pp
+++ b/manifests/peer.pp
@@ -6,10 +6,11 @@
 #
 define glusterfs::peer () {
 
-  exec { "/usr/sbin/gluster peer probe ${title}":
-    unless  => "/bin/egrep '^hostname.+=${title}$' /var/lib/glusterd/peers/*",
-    require => Service['glusterd'],
+  if $hostname != $title {  # No need to probe local host
+    exec { "/usr/sbin/gluster peer probe ${title}":
+      unless  => "/bin/egrep '^hostname.+=${title}$' /var/lib/glusterd/peers/*",
+      require => Service['glusterfs-server'],
+    }
   }
-
 }
 
diff --git a/manifests/volume.pp b/manifests/volume.pp
index 7a6ae2b..d31b772 100644
--- a/manifests/volume.pp
+++ b/manifests/volume.pp
@@ -18,7 +18,7 @@
   }
 
   exec { "/usr/sbin/gluster volume start ${title}":
-    unless  => "[ \"`gluster volume info ${title} | egrep '^Status:'`\" = 'Status: Started' ]",
+    unless  => "gluster volume info ${title} | grep '^Status: Started'",
     path    => [ '/usr/sbin', '/usr/bin', '/sbin', '/bin' ],
     require => Exec["gluster volume create ${title}"],
   }