diff --git a/src/bin/e_fm_op.c b/src/bin/e_fm_op.c
index 2e2c21c44..fae75f304 100644
--- a/src/bin/e_fm_op.c
+++ b/src/bin/e_fm_op.c
@@ -1132,7 +1132,7 @@ _e_fm_op_update_progress(E_Fm_Op_Task *task, off_t _plus_e_fm_op_done, off_t _pl
 
         eta = peta;
 
-        if (!s_time) s_time = ecore_time_get();
+        if (eina_dbleq(s_time, 0)) s_time = ecore_time_get();
 
         /* Update ETA once a second */
         if ((_e_fm_op_done) && (ecore_time_get() - c_time > 1.0))
@@ -1143,7 +1143,7 @@ _e_fm_op_update_progress(E_Fm_Op_Task *task, off_t _plus_e_fm_op_done, off_t _pl
           }
 
         if (!task) return;
-        if ((percent != ppercent) || (eta != peta) || (task != ptask))
+        if ((percent != ppercent) || (!EINA_DBL_CMP(eta, peta)) || (task != ptask))
           {
              ppercent = percent;
              peta = eta;
diff --git a/src/modules/fileman/e_mod_config.c b/src/modules/fileman/e_mod_config.c
index 80a8e4670..119c40a7c 100644
--- a/src/modules/fileman/e_mod_config.c
+++ b/src/modules/fileman/e_mod_config.c
@@ -250,8 +250,8 @@ _basic_check_changed(E_Config_Dialog *cfd  EINA_UNUSED,
      (fileman_config->icon.icon.w != cfdata->icon.icon.w) ||
      (fileman_config->icon.icon.h != cfdata->icon.icon.w) ||
      (fileman_config->icon.extension.show != cfdata->icon.extension.show) ||
-     (fileman_config->tooltip.delay != cfdata->tooltip.delay) ||
-     (fileman_config->tooltip.size != cfdata->tooltip.size) ||
+     (!EINA_DBL_CMP(fileman_config->tooltip.delay, cfdata->tooltip.delay)) ||
+     (!EINA_DBL_CMP(fileman_config->tooltip.size, cfdata->tooltip.size)) ||
      (fileman_config->tooltip.enable != cfdata->tooltip.enable) ||
      (fileman_config->tooltip.clamp_size != cfdata->tooltip.clamp_size) ||
      (fileman_config->selection.windows_modifiers != cfdata->selection.windows_modifiers) ||