diff --git a/src/cli/one_helper/onevm_helper.rb b/src/cli/one_helper/onevm_helper.rb
index 10b7c75c3d..b772ce61bb 100644
--- a/src/cli/one_helper/onevm_helper.rb
+++ b/src/cli/one_helper/onevm_helper.rb
@@ -92,14 +92,10 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
             end
 
             column :TIME, "Time since the VM was submitted", :size=>11 do |d|
-                stime = Time.at(d["STIME"].to_i)
-                etime = d["ETIME"]=="0" ? Time.now : Time.at(d["ETIME"].to_i)
-                dtime = Time.at(etime-stime).getgm
-                "%02d %02d:%02d:%02d" % [
-                    dtime.yday-1,
-                    dtime.hour,
-                    dtime.min,
-                    dtime.sec]
+                stime = d["STIME"].to_i
+                etime = d["ETIME"]=="0" ? Time.now.to_i : d["ETIME"].to_i
+                dtime = etime-stime
+                OpenNebulaHelper.period_to_str(dtime)
             end
 
             default :ID, :USER, :GROUP, :NAME, :STAT, :CPU, :MEM, :HOSTNAME,
@@ -201,24 +197,21 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
             end
 
             column :TIME, "Total time in this state", :size=>11 do |d|
-                stime = Time.at(d["STIME"].to_i)
-                etime = d["ETIME"]=="0" ? Time.now : Time.at(d["ETIME"].to_i)
-                dtime = Time.at(etime-stime).getgm
-                "%02d %02d:%02d:%02d" % [dtime.yday-1, dtime.hour,
-                    dtime.min, dtime.sec]
+                stime = d["STIME"].to_i
+                etime = d["ETIME"]=="0" ? Time.now.to_i : d["ETIME"].to_i
+                dtime = etime-stime
+                OpenNebulaHelper.period_to_str(dtime)
             end
 
             column :PTIME, "Prolog time for this state", :size=>11 do |d|
-                stime = Time.at(d["PSTIME"].to_i)
+                stime = d["PSTIME"].to_i
                 if d["PSTIME"]=="0"
-                    etime=Time.at(0)
+                    etime=0
                 else
-                    etime = d["PETIME"]=="0" ? Time.now :
-                        Time.at(d["PETIME"].to_i)
+                    etime = d["PETIME"]=="0" ? Time.now.to_i: d["PETIME"].to_i
                 end
-                dtime = Time.at(etime-stime).getgm
-                "%02d %02d:%02d:%02d" % [dtime.yday-1, dtime.hour,
-                    dtime.min, dtime.sec]
+                dtime = etime-stime
+                OpenNebulaHelper.period_to_str(dtime)
             end
 
             default :SEQ, :HOSTNAME, :REASON, :START, :TIME, :PTIME
diff --git a/src/cloud/occi/lib/OCCIServer.rb b/src/cloud/occi/lib/OCCIServer.rb
index 1a1a6357d1..1b38ca0807 100755
--- a/src/cloud/occi/lib/OCCIServer.rb
+++ b/src/cloud/occi/lib/OCCIServer.rb
@@ -46,7 +46,7 @@ COLLECTIONS = ["compute", "instance_type", "network", "storage"]
 POOL_FILTER = Pool::INFO_ALL
 
 # Secs to sleep between checks to see if image upload&copy to repo is finished
-IMAGE_POLL_SLEEP_TIME = 1
+IMAGE_POLL_SLEEP_TIME = 5
 
 class OCCIServer < CloudServer
     # Server initializer