diff --git a/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarData.cpp b/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarData.cpp
index e8032ea01125d1aab097409f471160c2da423f9e..662844be30f4f6a15de611fa6abbf65714728601 100644
--- a/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarData.cpp
+++ b/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarData.cpp
@@ -55,30 +55,20 @@ std::istream& operator>>(std::istream& is, AlosSarData& data)
   data.ClearRecords();
 
   AlosSarRecordHeader header;
-  bool eof = false;
-  while(!eof)
+
+  is>>header;
+
+  AlosSarRecord* record = new AlosSarDataFileDescriptor;
+  if (record != NULL)
+  {
+    record->Read(is);
+    data._records[header.get_rec_seq()] = record;
+  }
+  else
   {
-    is>>header;
-    if(is.eof())
-    {
-      eof = true;
-    }
-    else
-    {
-      AlosSarRecord* record = new AlosSarDataFileDescriptor;
-      if (record != NULL)
-      {
-        record->Read(is);
-        data._records[header.get_rec_seq()] = record;
-        eof = true;
-      }
-      else
-      {
-        char* buff = new char[header.get_length()-12];
-        is.read(buff, header.get_length()-12);
-        delete buff;
-      }
-    }
+    char* buff = new char[header.get_length()-12];
+    is.read(buff, header.get_length()-12);
+    delete buff;
   }
   return is;
 }
@@ -133,7 +123,6 @@ bool AlosSarData::saveState(ossimKeywordlist& kwl,
 
   char name[64];
 
-  kwl.add(prefix, ossimKeywordNames::TYPE_KW, "ossimAlosSarModel", true);
   /*
    * Adding metadata necessary to the sensor model in the keywordlist
    */
diff --git a/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarDataFileDescriptor.cpp b/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarDataFileDescriptor.cpp
index ea310045b5e8285208b5281027d58f67ea60b25d..e6242d70034371006f62d76f5bec3739d5a580a4 100644
--- a/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarDataFileDescriptor.cpp
+++ b/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarDataFileDescriptor.cpp
@@ -49,8 +49,6 @@ std::istream& operator>>(std::istream& is, AlosSarDataFileDescriptor& data)
 
   is.read(buf6,6);
   data._num_lines = atoi(buf6);
-  // FIXME debug
-  std::cout << std::endl << "buf6: {" << buf6 << "}" << std::endl;
 
   is.read(buf94,94);
 
@@ -58,8 +56,6 @@ std::istream& operator>>(std::istream& is, AlosSarDataFileDescriptor& data)
   is.read(buf8,8);
   tmpval = atoi(buf8);
   data._num_pix_in_line = tmpval/8; // Assume data always in 8-byte complex format
-  // FIXME debug
-  std::cout << std::endl << "buf8: {" << buf8 << "}" << std::endl;
 
   char buf432[433];
   buf432[432] = '\0';
diff --git a/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarLeader.cpp b/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarLeader.cpp
index b137076704ce5a878f2e7ebacb5e8819858ced0d..853c45b08cf3a41e4a05ebe67b0127fe3323667c 100644
--- a/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarLeader.cpp
+++ b/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarLeader.cpp
@@ -140,7 +140,7 @@ bool AlosSarLeader::saveState(ossimKeywordlist& kwl,
 
   char name[64];
 
-  kwl.add(prefix, ossimKeywordNames::TYPE_KW, "ossimAlosSarModel", true);
+  //kwl.add(prefix, ossimKeywordNames::TYPE_KW, "ossimAlosPalsarModel", true);
   /*
    * Adding metadata necessary to the sensor model in the keywordlist
    */
diff --git a/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarRecordFactory.h b/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarRecordFactory.h
index 4a772ad6d74a727008c49b81d665f9a4a0ff67f0..8647cc5aadf68f75d8e30554917607a3ee3f8a2e 100644
--- a/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarRecordFactory.h
+++ b/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarRecordFactory.h
@@ -59,4 +59,4 @@ protected:
 private:
 };
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/Utilities/otbossimplugins/ossim/ossimAlosPalsarModel.cpp b/Utilities/otbossimplugins/ossim/ossimAlosPalsarModel.cpp
index 9fa65b89737378e5a98718bd08469ad122268570..ce8c08d81a210779a994e7bdf486d0eccdb80c78 100644
--- a/Utilities/otbossimplugins/ossim/ossimAlosPalsarModel.cpp
+++ b/Utilities/otbossimplugins/ossim/ossimAlosPalsarModel.cpp
@@ -255,7 +255,7 @@ bool ossimAlosPalsarModel::saveState(ossimKeywordlist& kwl,
 
   char name[64];
 
-  //kwl.add(prefix, ossimKeywordNames::TYPE_KW, "ossimAlosPalsarModel", true);
+  kwl.add(prefix, ossimKeywordNames::TYPE_KW, "ossimAlosPalsarModel", true);
 
   if (theAlosSarLeader == NULL)
   {
@@ -761,7 +761,6 @@ bool ossimAlosPalsarModel::isAlosPalsarData(const ossimFilename& file) const
 
 ossimFilename ossimAlosPalsarModel::findAlosPalsarData(const ossimFilename& file) const
 {
-  //FIXME
   ossimFilename dataFile = file;
   ossimString imgPrefix("IMG-HH"); // Assume the ALOS data always has at least the HH
   ossimString trlPrefix("TRL");