diff --git a/lib/vmpooler/api/helpers.rb b/lib/vmpooler/api/helpers.rb
index 0f23842..3c9f487 100644
--- a/lib/vmpooler/api/helpers.rb
+++ b/lib/vmpooler/api/helpers.rb
@@ -114,11 +114,13 @@ module Vmpooler
       end
 
       def export_tags(backend, hostname, tags)
-        tags.each_pair do |tag, value|
-          next if value.nil? or value.empty?
+        backend.pipelined do
+          tags.each_pair do |tag, value|
+            next if value.nil? or value.empty?
 
-          backend.hset("vmpooler__vm__#{hostname}", "tag:#{tag}", value)
-          backend.hset("vmpooler__tag__#{Date.today}", "#{hostname}:#{tag}", value)
+            backend.hset("vmpooler__vm__#{hostname}", "tag:#{tag}", value)
+            backend.hset("vmpooler__tag__#{Date.today}", "#{hostname}:#{tag}", value)
+          end
         end
       end
 
diff --git a/lib/vmpooler/pool_manager.rb b/lib/vmpooler/pool_manager.rb
index 6e969ff..e473364 100644
--- a/lib/vmpooler/pool_manager.rb
+++ b/lib/vmpooler/pool_manager.rb
@@ -868,7 +868,7 @@ module Vmpooler
 
             if options[:clone_target_change]
               clone_target = redis.hget('vmpooler__config__clone_target}', options[:poolname])
-              break if clone_target && !clone_target == initial_clone_target
+              break if clone_target && clone_target != initial_clone_target
             end
 
             if options[:pool_template_change]