diff --git a/code/AssetLib/Collada/ColladaParser.cpp b/code/AssetLib/Collada/ColladaParser.cpp
index b353264a3..01103ddf8 100644
--- a/code/AssetLib/Collada/ColladaParser.cpp
+++ b/code/AssetLib/Collada/ColladaParser.cpp
@@ -316,6 +316,8 @@ void ColladaParser::ReadAssetInfo(XmlNode &node) {
             }
         } else if (name == "contributor") {
             ReadMetaDataItem(currentNode, mAssetMetaData);
+        } else {
+            ReadMetaDataItem(currentNode, mAssetMetaData);
         }
     }
 }
@@ -408,6 +410,7 @@ void ColladaParser::PostProcessControllers() {
         if (meshId.empty()) {
             continue;
         }
+
         ControllerLibrary::iterator findItr = mControllerLibrary.find(meshId);
         while (findItr != mControllerLibrary.end()) {
             meshId = findItr->second.mMeshId;
@@ -1442,6 +1445,7 @@ void ColladaParser::ReadDataArray(XmlNode &node) {
 
                 ai_real value;
                 // read a number
+                //SkipSpacesAndLineEnd(&content);
                 content = fast_atoreal_move<ai_real>(content, value);
                 data.mValues.push_back(value);
                 // skip whitespace after it
diff --git a/include/assimp/StringUtils.h b/include/assimp/StringUtils.h
index 9ebff9406..57b88ea5e 100644
--- a/include/assimp/StringUtils.h
+++ b/include/assimp/StringUtils.h
@@ -52,6 +52,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <sstream>
 #include <stdarg.h>
 #include <cstdlib>
+#include <algorithm> 
+#include <cctype>
+#include <locale>
 
 ///	@fn		ai_snprintf
 ///	@brief	The portable version of the function snprintf ( C99 standard ), which works on visual studio compilers 2013 and earlier.
@@ -173,7 +176,7 @@ inline void ltrim(std::string &s) {
 inline void rtrim(std::string &s) {
     s.erase(std::find_if(s.rbegin(), s.rend(), [](unsigned char ch) {
         return !std::isspace(ch);
-    }).base(),s.end());
+    }).base(), s.end());
 }
 
 // trim from both ends (in place)
diff --git a/test/unit/utColladaExport.cpp b/test/unit/utColladaExport.cpp
index efb2d7f17..56b24798e 100644
--- a/test/unit/utColladaExport.cpp
+++ b/test/unit/utColladaExport.cpp
@@ -47,6 +47,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/Exporter.hpp>
 #include <assimp/Importer.hpp>
 
+#include <array>
+
 #ifndef ASSIMP_BUILD_NO_EXPORT
 
 class utColladaExport : public ::testing::Test {
@@ -77,6 +79,7 @@ TEST_F(utColladaExport, testExportCamera) {
 
     EXPECT_EQ(AI_SUCCESS, ex->Export(pTest, "collada", file));
     const unsigned int origNumCams(pTest->mNumCameras);
+    //std::vector<float> origFOV;
     std::unique_ptr<float[]> origFOV(new float[origNumCams]);
     std::unique_ptr<float[]> orifClipPlaneNear(new float[origNumCams]);
     std::unique_ptr<float[]> orifClipPlaneFar(new float[origNumCams]);
diff --git a/test/unit/utIssues.cpp b/test/unit/utIssues.cpp
index c6fcd20aa..5dba553ec 100644
--- a/test/unit/utIssues.cpp
+++ b/test/unit/utIssues.cpp
@@ -52,7 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 using namespace Assimp;
 
 class utIssues : public ::testing::Test {
-
+    // empty
 };
 
 #ifndef ASSIMP_BUILD_NO_EXPORT