diff --git a/share/man/build.sh b/share/man/build.sh
index 0e55f30e92..b864f8b111 100755
--- a/share/man/build.sh
+++ b/share/man/build.sh
@@ -50,9 +50,9 @@ COMMANDS=(
     'bin/oneprovision'      'manages OpenNebula provisions'
     'bin/oneprovider'       'manages OpenNebula providers'
 
-    'oneflow'           'Manage oneFlow Services'
-    'oneflow-template'  'Manage oneFlow Templates'
-    'onevmdump'         'Dumps VM content'
+    'bin/oneflow'           'Manage oneFlow Services'
+    'bin/oneflow-template'  'Manage oneFlow Templates'
+    'bin/onevmdump'         'Dumps VM content'
 
     'lib/onegate/onegate'   'Manage communication between VMs and OpenNebula'
 
diff --git a/src/im_mad/remotes/lib/monitord_client.rb b/src/im_mad/remotes/lib/monitord_client.rb
index 0483de8076..ea12b1595c 100644
--- a/src/im_mad/remotes/lib/monitord_client.rb
+++ b/src/im_mad/remotes/lib/monitord_client.rb
@@ -57,7 +57,7 @@ class MonitorClient
     # :pubkey [:String] public key to encrypt messages
     def initialize(server, port, id, opt = {})
         @opts = {
-            :pubkey => ''
+            :pubkey => nil
         }.merge opt
 
         addr = Socket.getaddrinfo(server, port)[0]
@@ -77,7 +77,7 @@ class MonitorClient
 
     # Formats message payload to send over the wire
     def pack(data)
-        if @pubkey && !@pubkey.empty?
+        if @pubkey
             block_size = @pubkey.n.num_bytes - 11
 
             edata = ''