diff --git a/src/hm_mad/one_hm.rb b/src/hm_mad/one_hm.rb
index 6fd49d55d8..71ca59ddad 100644
--- a/src/hm_mad/one_hm.rb
+++ b/src/hm_mad/one_hm.rb
@@ -37,22 +37,20 @@ require 'CommandManager'
 class HookManagerDriver < OpenNebulaDriver
     def initialize(num)
         super(num, true)
-        
+
         register_action(:EXECUTE, method("action_execute"))
     end
-    
+
     def action_execute(number, hook_name, host, script, *arguments)
         cmd=nil
         cmd_string="#{script} #{arguments.join(' ')}"
-        
+
         if host.upcase=="LOCAL"
             cmd=LocalCommand.run(cmd_string, log_method(number))
         else
-            cmd=SSHCommand.run(cmd_string, host, log_method(number))
+            cmd=SSHCommand.run("'#{cmd_string}'", host, log_method(number))
         end
-        
-        pp cmd.stdout
-        
+
         if cmd.code==0
             send_message("EXECUTE", RESULT[:success], number, hook_name)
         else
diff --git a/src/vmm/LibVirtDriver.cc b/src/vmm/LibVirtDriver.cc
index 2ce3991a4a..47aa475fca 100644
--- a/src/vmm/LibVirtDriver.cc
+++ b/src/vmm/LibVirtDriver.cc
@@ -331,7 +331,7 @@ int LibVirtDriver::deployment_description(
             file << "\t\t<disk type='file' device='disk'>" << endl;
             file << "\t\t\t<source file='" << vm->get_remote_dir() << "/disk."
                  << num << "'/>" << endl;
-            file << "\t\t\t<target dev='" << target << "'/>";
+            file << "\t\t\t<target dev='" << target << "'/>" << endl;
             file << "\t\t\t<readonly/>" << endl;
             file << "\t\t</disk>" << endl;
         }