diff --git a/src/cg/cg0200.cpp b/src/cg/cg0200.cpp
index 4cd300003..9c021ed18 100755
--- a/src/cg/cg0200.cpp
+++ b/src/cg/cg0200.cpp
@@ -941,24 +941,23 @@ int TClifo_application::read(TMask& m)
       riga.add(rec.get(IND_TEL));
       riga.add(rec.get(IND_PFAX));
       riga.add(rec.get(IND_FAX));
-			riga.add(rec.get(IND_IVARID));
-
+      riga.add(rec.get(IND_IVARID));
 
       TString8 key;
-    	
+
       key << rec.get(IND_STATO); 
       key << '|' << rec.get(IND_COM);
-    	
-      const TRectype & com = cache().get(LF_COMUNI, key);
-    	
+
+      const TRectype& com = cache().get(LF_COMUNI, key);
+
       riga.add(com.get(COM_DENCOM));
       riga.add(rec.get(IND_INDIR2));
-			riga.add(rec.get(IND_PADESTIN));
-			riga.add(rec.get(IND_PARIFAMM));
-    	riga.add(rec.get(IND_CODIND));
+      riga.add(rec.get(IND_PADESTIN));
+      riga.add(rec.get(IND_PARIFAMM));
+      riga.add(rec.get(IND_CODIND));
 
       indsp_sheet().row(i)=riga;
-      
+
       // Load the sheets of CODINDDOC, CODINDSP, CODINDEFF.
       riga.cut(0);
       riga.add(rec.get(IND_CODIND));
@@ -1370,12 +1369,12 @@ void TClifo_application::common_f(const TMask& m)
       rec.put(IND_PFAX,row.get());
       rec.put(IND_FAX,row.get());
       rec.put(IND_IVARID,row.get());
-			row.get();
-			rec.put(IND_INDIR2, row.get());
-			rec.put(IND_PADESTIN, row.get());
-			rec.put(IND_PARIFAMM, row.get());
-			rec.put(IND_CODIND,i+1);
-    }  
+      row.get();
+      rec.put(IND_INDIR2,row.get());
+      rec.put(IND_PADESTIN, row.get());
+      rec.put(IND_PARIFAMM, row.get());
+      rec.put(IND_CODIND,i+1);
+    }
 
     TToken_string data;
     TString8 first, second; 
diff --git a/src/cg/cg0200a.uml b/src/cg/cg0200a.uml
index 491a8d086..0874f4851 100755
--- a/src/cg/cg0200a.uml
+++ b/src/cg/cg0200a.uml
@@ -1329,8 +1329,8 @@ BEGIN
   ITEM "Iva Rid."
   ITEM "Comune@50"
   ITEM "Indirizzo aggiuntivo@35"
-  ITEM "Destinatario"
-  ITEM "Riferimento amministrazione"
+  ITEM "Codice Destinatario@15"
+  ITEM "Riferimento Amministrazione@20"
 END
 
 GROUPBOX DLG_NULL 76 3
diff --git a/src/cg/cg0200b.uml b/src/cg/cg0200b.uml
index 1ae76ed1e..d517f2986 100755
--- a/src/cg/cg0200b.uml
+++ b/src/cg/cg0200b.uml
@@ -137,7 +137,7 @@ END
 
 STRING F_PADESTINI 7
 BEGIN
-  PROMPT 2 15 "Destinatario "
+  PROMPT 2 15 "Codice Destinatario (SdI)"
   FLAGS ""
   MODULES PA,FP
   HELP "Codice ufficio dell destinatario della fattura elettronica"
@@ -145,7 +145,7 @@ END
 
 STRING F_PARIFAMMI 20
 BEGIN
-  PROMPT 2 17 "Riferimento amministrazione "
+  PROMPT 2 17 "Codice riferimento amministrazione"
   FLAGS "U"
   MODULES PA,FP
   HELP "Codice del cedente presso l'amministrazione"
diff --git a/src/cg/cglib.h b/src/cg/cglib.h
index 24921b6e9..c64918b4d 100644
--- a/src/cg/cglib.h
+++ b/src/cg/cglib.h
@@ -1470,10 +1470,9 @@ protected:
 	virtual int write_rewrite(TBaseisamfile& f, bool re = false) const;
 	void init();
 	const TAnagrafica & anagr();
-	const TOccasionale * occasionale() const{ return new TOccasionale(_occasionale); }
-public:
 
 public:
+  const TOccasionale * occasionale() const { return new TOccasionale(_occasionale); }
 	bool read_lettera(const TDate & data, bool extended = false);
 	bool is_occasionale() const { return get_bool(CLI_OCCAS); }
 	TRectype& vendite() const;
diff --git a/src/fp/fplib01.cpp b/src/fp/fplib01.cpp
index 1ea58f566..8d04e7523 100644
--- a/src/fp/fplib01.cpp
+++ b/src/fp/fplib01.cpp
@@ -218,7 +218,7 @@ bool get_coddest(const char tipocf, const long codcf, TString& coddest, TString&
     indsp.put(IND_CODCF,  codcf);
     indsp.put(IND_CODIND, cod_ind_sped);
     indsp.read();
-    coddest = indsp.get(IND_CODDEST);
+    coddest = indsp.get(IND_PADESTIN);
   }
   if(coddest.empty())
     coddest = clifo.vendite().get("PADESTIN");
@@ -1564,7 +1564,7 @@ bool TDoc_fp::doc_to_paf(TDocumentoEsteso& doc)
       indsp.put(IND_CODCF,  doc.get(DOC_CODCF));
       indsp.put(IND_CODIND, doc.get(DOC_CODINDSP));
       indsp.read();
-      rifamm = indsp.get(IND_RIFAMM);
+      rifamm = indsp.get(IND_PARIFAMM);
       if(rifamm.blank())
         rifamm = doc.clifor().vendite().get(CFV_PARIFAMM);
 		}