diff --git a/ve/velib02.cpp b/ve/velib02.cpp
index 3ab382a10..ab927343c 100755
--- a/ve/velib02.cpp
+++ b/ve/velib02.cpp
@@ -916,7 +916,7 @@ void TRiga_documento::autosave(TSheet_field & f)
     put( RDOC_ADDIVA, row.get( f.cid2index(FR_ADDIVA )) );
     put( RDOC_ASPBENI, row.get( f.cid2index(FR_ASPBENI )) );  
     put( RDOC_CAUSMAG, row.get( f.cid2index(FR_CAUS )) );  
-    TString16 codmagc(row.get(f.cid2index(FR_CODMAGC)));
+    TString8 codmagc(row.get(f.cid2index(FR_CODMAGC)));
       
     codmagc.left_just(3);
     codmagc << row.get( f.cid2index(FR_CODDEPC ));
@@ -932,12 +932,13 @@ void TRiga_documento::autosave(TSheet_field & f)
     put( RDOC_IMPIANTO, row.get( f.cid2index(FR_IMPIANTO )) );  
     put( RDOC_LINEA, row.get( f.cid2index(FR_LINEA )) );  
 
+    f.select(num);  // Seleziona la riga in modo da selezionare la maschera di riga giusta
     for (short cdcid = FR_CDC1; cdcid <= FR_CDC12; cdcid++)
     {
       const int pos = m.id2pos(cdcid);
       if (pos < 0)
         break;
-      TMask_field& fld = m.fld(pos);
+      const TMask_field& fld = m.fld(pos);
       const TFieldref* fldref = fld.field();
       if (fldref == NULL)
         break;
@@ -1013,12 +1014,12 @@ void TRiga_documento::autoload(TSheet_field & f)
   }
 }
 
-TArticolo_giacenza * TRiga_documento::articolo() const
+TArticolo_giacenza* TRiga_documento::articolo() const
 {                
   if (_articoli == NULL)
     _articoli = new TCache_articoli();
 
-  const TString & codart = get(RDOC_CODARTMAG);
+  const TString& codart = get(RDOC_CODARTMAG);
   if (codart.empty())
     return NULL;
   return &(_articoli->art(codart));