diff --git a/cg/cg2102.cpp b/cg/cg2102.cpp
index e1b8752f7..5d95815d7 100755
--- a/cg/cg2102.cpp
+++ b/cg/cg2102.cpp
@@ -1279,7 +1279,7 @@ bool TPrimanota_application::iva_notify(TSheet_field& iva, int r, KEY k)
         if (ri == 4)                           // Se non esiste il conto IVA indetraibile ...
         {                                      // ... somma imponibile e imposta
           oldimp += oldiva;                    
-          oldiva = 0.0;                             
+          oldiva.set('D', 0.0);                             
         }
     }  
     
diff --git a/cg/cg2106.cpp b/cg/cg2106.cpp
index 94f242414..19dabde7c 100755
--- a/cg/cg2106.cpp
+++ b/cg/cg2106.cpp
@@ -1,9 +1,9 @@
 #include <colors.h>
 #include <execp.h>
 #include <modaut.h>
+#include <os_dep.h>
 #include <utility.h>
 #include <varmask.h>
-#include <windows.h>     
 
 #include "cg2100.h"
 #include "cg2102.h"
@@ -393,24 +393,7 @@ bool TPrimanota_application::easydoc_installed()
   // check autorization
   if (!has_module(AIAUT))
     return FALSE;      
-    
-  // where is EasyDoc installed?                 
-  GetPrivateProfileString("Easydoc", "Path", "\\EASYDOC", 
-                          _EasyDocPath.get_buffer(), _EasyDocPath.size(), 
-                          "EasyDoc.ini");  
-  // EasyDoc there isn't
-  if (_EasyDocPath.empty())
-    return FALSE;
-  
-  // paste EasyDoc path
-  _EasyDocPath.add("EASYDOC.EXE");    
-  
-  // is EasyDoc present?
-  bool ok = fexist(_EasyDocPath);
-  if (!ok)
-    _EasyDocPath.cut(0);
-  
-  return ok;
+  return os_get_image_editor_path(_EasyDocPath);
 }
 
 // Il documento attuale e' connesso a easydoc?