diff --git a/CMakeLists.txt b/CMakeLists.txt
index f4c59c042..d799c71f1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,10 +40,6 @@ PROJECT( Assimp )
 
 # All supported options ###############################################
 
-if(NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE "Release")
-endif()
-
 OPTION( BUILD_SHARED_LIBS
   "Build package with shared libraries."
   ON
@@ -340,9 +336,7 @@ ENDIF(NOT ZLIB_FOUND)
 INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
 
 # Search for unzip
-IF (NOT IOS)
 use_pkgconfig(UNZIP minizip)
-ENDIF (NOT IOS)
 
 IF ( ASSIMP_NO_EXPORT )
   ADD_DEFINITIONS( -DASSIMP_BUILD_NO_EXPORT)
diff --git a/code/TriangulateProcess.cpp b/code/TriangulateProcess.cpp
index a0bcd9a45..f8202b3d3 100644
--- a/code/TriangulateProcess.cpp
+++ b/code/TriangulateProcess.cpp
@@ -287,10 +287,7 @@ bool TriangulateProcess::TriangulateMesh( aiMesh* pMesh)
             // We project it onto a plane to get a 2d triangle.
 
             // Collect all vertices of of the polygon.
-            // size of temp_verts3d is (max_out+2);
-            // max = (int)face.mNumIndices
-            int smallerMax = (max<=((int)max_out+2))?(max):((int)max_out+2);
-            for (tmp = 0; tmp < smallerMax; ++tmp) {
+           for (tmp = 0; tmp < max; ++tmp) {
                 temp_verts3d[tmp] = verts[idx[tmp]];
             }