diff --git a/include/bagn006.uml b/include/bagn006.uml
index 7c8e7fd9f..731419ae2 100755
--- a/include/bagn006.uml
+++ b/include/bagn006.uml
@@ -3,45 +3,44 @@
 
 TOOLBAR "" 0 0 0 2
 
-BUTTON DLG_OK 10 2
+BUTTON DLG_OK
 BEGIN
   PROMPT -15 -1 ""
 END
 
-BUTTON F_NEWREC 10 2
+BUTTON F_NEWREC
 BEGIN
   PROMPT -25 -1 "~Nuovo"
   PICTURE TOOL_NEWREC
 END
 
-BUTTON F_LINK 10 2
+BUTTON F_LINK
 BEGIN
   PROMPT -35 -1 "~Edit"
   PICTURE TOOL_EDIT
 END
 
-BUTTON F_PRINT 10 2
+BUTTON F_PRINT
 BEGIN
   PROMPT -45 -1 "Stampa"
   PICTURE TOOL_PRINT
 END
 
-BUTTON DLG_CANCEL 10 2
+BUTTON DLG_CANCEL
 BEGIN
   PROMPT -55 -1 ""
 END
 
 ENDPAGE
 
-
 PAGE "Oggetti esterni" 0 2 0 0
 
-SPREADSHEET F_SHEET 78
+SPREADSHEET F_SHEET
 BEGIN
-  PROMPT 1 4 "Lista"
-  ITEM "File@35"
-  ITEM "Nome@20"
-  ITEM "Collegamento"
+  PROMPT 0 4 "Lista"
+  ITEM "File@60"
+  ITEM "Nome@32"
+  ITEM "Link"
 END
 
 ENDPAGE
@@ -50,7 +49,7 @@ ENDMASK
 
 PAGE "Oggetto esterno" -1 -1 60 4
 
-STRING S_FILE 256 50
+STRING S_FILE 260 50
 BEGIN      
   PROMPT 1 1 "File  "
   FLAGS "B"
@@ -71,36 +70,36 @@ ENDPAGE
 
 TOOLBAR "topbar" 0 0 0 2
 
-BUTTON DLG_OK 10 2
+BUTTON DLG_OK
 BEGIN
   PROMPT -16 -1 ""
 END
 
-BUTTON F_NEWREC 10 2
+BUTTON F_NEWREC
 BEGIN
   PROMPT -26 -1 "~Nuovo"
   PICTURE TOOL_NEWREC
 END
 
-BUTTON F_LINK 10 2
+BUTTON F_LINK
 BEGIN
   PROMPT -36 -1 "~Edit"
   PICTURE TOOL_EDIT
 END
 
-BUTTON DLG_DELREC 10 2
+BUTTON DLG_DELREC
 BEGIN
   PROMPT -46 -1 ""
   PICTURE TOOL_DELREC
 END
 
-BUTTON F_PRINT 10 2
+BUTTON F_PRINT
 BEGIN
   PROMPT -56 -1 "Stampa"
   PICTURE TOOL_PRINT
 END
 
-BUTTON DLG_CANCEL 10 2
+BUTTON DLG_CANCEL
 BEGIN
   PROMPT -66 -1 ""
 END
diff --git a/include/config.cpp b/include/config.cpp
index 775fc8168..0aa17ca9b 100755
--- a/include/config.cpp
+++ b/include/config.cpp
@@ -1,5 +1,3 @@
-#include <time.h>
-
 #include <applicat.h>
 #include <colors.h>
 #include <config.h>
@@ -762,6 +760,7 @@ static void cfg2file(int which_config, TFilename& file)
         file.add(u);
         file.ext("ini");
       }
+      break;
     default:
       break;
     }
diff --git a/include/golem.cpp b/include/golem.cpp
index c1afe9888..aacd641d1 100755
--- a/include/golem.cpp
+++ b/include/golem.cpp
@@ -83,7 +83,6 @@ protected:
 
 public:
   TGolem_mask();
-  virtual ~TGolem_mask() { }
 };
 
 bool TGolem_mask::file_handler(TMask_field& f, KEY k)
@@ -415,7 +414,7 @@ bool TGolem_field::autosave(TRelation& r)
                                   golem_path.compare(old_file, golem_path.len(), true) == 0;
           const bool tobe_stored = new_row.get_char(2) <= ' ';
           if (was_stored && fexist(old_file))
-            ::remove(old_file);
+            old_file.fremove();
           if (tobe_stored && !new_file.blank())
           {                
             char ext[_MAX_EXT];
@@ -429,7 +428,7 @@ bool TGolem_field::autosave(TRelation& r)
             // Cancella il file originale se temporaneo
             TFilename tmp; tmp.tempdir();
             if (tmp.compare(new_file, tmp.len(), true) == 0)
-              ::remove(new_file);
+              new_file.fremove();
           }
         }
       }