diff --git a/include/colors.cpp b/include/colors.cpp
index 59dbc5d46..3816d0a00 100755
--- a/include/colors.cpp
+++ b/include/colors.cpp
@@ -87,6 +87,8 @@ TColor_row_mask::TColor_row_mask()
 void TColor_row_mask::update()
 {               
   TSheet_field* s = get_sheet();
+  if (s == NULL)
+  	return;
   TSelect_color_mask& m = (TSelect_color_mask&)s->mask();
   COLOR back, fore;
   m.get_cur_colors(back, fore);
diff --git a/include/controls.cpp b/include/controls.cpp
index 885d4d098..9bac932ce 100755
--- a/include/controls.cpp
+++ b/include/controls.cpp
@@ -177,17 +177,14 @@ XVT_FNTID xvt_default_font(bool bold)
     ROWY = (pc.bottom - pc.top) / 25;
     const int COLX = (pc.right - pc.left) / 80;
 
-    // Vecchio metodo di calcolo di CHARX dipendente dalla moda
-    // TString str(80, 'M');
-    // CHARX = xvt_dwin_get_text_width(TASK_WIN, str.get_buffer(), str.size()) / str.size();
+    TString str(80, 'M');
+    CHARX = xvt_dwin_get_text_width(TASK_WIN, str.get_buffer(), str.size()) / str.size();
     
     int leading, ascent, descent;
     xvt_dwin_get_font_metrics(TASK_WIN, &leading, &ascent, &descent);
     CHARY = ascent + descent + 1;
     BASEY = ascent;
     
-    CHARX = 3*ascent/4; // Nuovo metodo di calcolo di CHARX piu' stabile
-
     if (CHARX > COLX)
       CHARX = COLX;
 
diff --git a/include/relapp.cpp b/include/relapp.cpp
index 3ce6a9a79..93545bf4f 100755
--- a/include/relapp.cpp
+++ b/include/relapp.cpp
@@ -1670,8 +1670,7 @@ bool TRelation_application::parse_command_line()
   for (int i = argc()-1; i > 0; i--)
   {
     ini = argv(i);
-    ini.upper();
-    if ((ini[0] == '-' || ini[0] == '/') && ini[1] == 'I')
+    if ((ini[0] == '-' || ini[0] == '/') && (ini[1] == 'I' || ini[1] == 'i'))
     {
       ini.ltrim(2);
       CHECK(!ini.blank(),"Manca l'indicazione della transazione. Il nome va indicato di seguito al -i, senza interporre spaziatura.");