diff --git a/Common/OfficeFileFormatChecker2.cpp b/Common/OfficeFileFormatChecker2.cpp
index 1fdb6b6f34..2ee7f1bede 100644
--- a/Common/OfficeFileFormatChecker2.cpp
+++ b/Common/OfficeFileFormatChecker2.cpp
@@ -299,7 +299,7 @@ bool COfficeFileFormatChecker::isOleObjectFile(POLE::Storage *storage)
 		std::string UserType, ClipboardFormat, Program;
 
 		POLE::Stream streamCompObject(storage, L"CompObj");
-		if (false == streamCompObject.fail())
+		if (false == streamCompObject.fail() && streamCompObject.size() >= 28)
 		{
 			streamCompObject.seek(28); // skip Header
 
diff --git a/OOXML/Binary/Sheets/Reader/BinaryWriter.cpp b/OOXML/Binary/Sheets/Reader/BinaryWriter.cpp
index 073c3f05a0..cbec1638f2 100644
--- a/OOXML/Binary/Sheets/Reader/BinaryWriter.cpp
+++ b/OOXML/Binary/Sheets/Reader/BinaryWriter.cpp
@@ -5867,7 +5867,7 @@ void BinaryWorksheetTableWriter::WriteOleObjects(const OOX::Spreadsheet::CWorksh
 				}
 			}
 		}
-		if (pImageFileCache.IsInit() && pOleObject->m_oObjectPr.IsInit() && pOleObject->m_oObjectPr->m_oRid.IsInit())
+		if (false == pImageFileCache.IsInit() && pOleObject->m_oObjectPr.IsInit() && pOleObject->m_oObjectPr->m_oRid.IsInit())
 		{
 			sIdImageFileCache = pOleObject->m_oObjectPr->m_oRid->GetValue();
 
diff --git a/OdfFile/DataTypes/iconset_type.h b/OdfFile/DataTypes/iconset_type.h
index e06745520c..cfee13fb15 100644
--- a/OdfFile/DataTypes/iconset_type.h
+++ b/OdfFile/DataTypes/iconset_type.h
@@ -60,8 +60,8 @@ public:
 		Arrows5Gray,
 		Quarters5,
 		Rating5,
-        Stars3,
         Triangles3,
+        Stars3,
         Boxes5
    };
 
diff --git a/OdfFile/Reader/Format/calcext_elements.cpp b/OdfFile/Reader/Format/calcext_elements.cpp
index 7460fde492..2eee236ec8 100644
--- a/OdfFile/Reader/Format/calcext_elements.cpp
+++ b/OdfFile/Reader/Format/calcext_elements.cpp
@@ -238,7 +238,7 @@ void calcext_icon_set::xlsx_convert(oox::xlsx_conversion_context & Context)
 	}
 }
 	
-// calcext_formatting_entry
+///  calcext:formatting-entry
 //---------------------------------------------------------------------------------------------------------
 const wchar_t * calcext_formatting_entry::ns	= L"calcext";
 const wchar_t * calcext_formatting_entry::name	= L"formatting-entry";
diff --git a/OdfFile/Writer/Format/calcext_elements.cpp b/OdfFile/Writer/Format/calcext_elements.cpp
index 49efa3a4b4..2e2fda1e7a 100644
--- a/OdfFile/Writer/Format/calcext_elements.cpp
+++ b/OdfFile/Writer/Format/calcext_elements.cpp
@@ -239,7 +239,7 @@ void calcext_icon_set::serialize(std::wostream & _Wostream)
 	}
 }
 	
-// calcext_formatting_entry
+// calcext:formatting-entry
 //////////////////////////////////////////////////////////////////////////////////////////////////
 const wchar_t * calcext_formatting_entry::ns	= L"calcext";
 const wchar_t * calcext_formatting_entry::name	= L"formatting-entry";