diff --git a/ApplicationCode/CommandFileInterface/Core/RicfFieldCapability.h b/ApplicationCode/CommandFileInterface/Core/RicfFieldCapability.h
index 92c4f77718..d24c614574 100644
--- a/ApplicationCode/CommandFileInterface/Core/RicfFieldCapability.h
+++ b/ApplicationCode/CommandFileInterface/Core/RicfFieldCapability.h
@@ -130,8 +130,8 @@ struct RicfFieldReader< std::vector<T> >
                     errorMessageContainer->skipWhiteSpaceWithLineNumberCount(inputStream);
                 }
 
-                typename T value;
-                RicfFieldReader<typename T>::readFieldData(value, inputStream, errorMessageContainer);
+                T value;
+                RicfFieldReader<T>::readFieldData(value, inputStream, errorMessageContainer);
                 fieldValue.push_back(value);
             }
         }
@@ -146,12 +146,12 @@ struct RicfFieldReader< std::vector<T> >
 template <typename T>
 struct RicfFieldWriter< std::vector<T> >
 {
-    static void    writeFieldData(const std::vector<T>& fieldValue, QTextStream&  outputStream)
+    static void writeFieldData(const std::vector<T>& fieldValue, QTextStream&  outputStream)
     {
         outputStream << "[";
         for (size_t i = 0; i < fieldValue.size(); ++i)
         {
-            RicfFieldWriter<typename T>::writeFieldData(fieldValue[i], outputStream); 
+            RicfFieldWriter<T>::writeFieldData(fieldValue[i], outputStream); 
             if (i < fieldValue.size() - 1)
             {
                 outputStream << ", ";
diff --git a/ApplicationCode/UnitTests/RifcCommandCore-Test.cpp b/ApplicationCode/UnitTests/RifcCommandCore-Test.cpp
index 7b5141449e..7c0da02947 100644
--- a/ApplicationCode/UnitTests/RifcCommandCore-Test.cpp
+++ b/ApplicationCode/UnitTests/RifcCommandCore-Test.cpp
@@ -121,7 +121,7 @@ TEST(RicfCommands, ErrorMessages)
     for (const auto& msg: errors.m_messages)
     {
         QString label;
-        if (msg.first == RicfMessages::ERROR)
+        if (msg.first == RicfMessages::MESSAGE_ERROR)
         {
             label = "Error  : ";
         }
@@ -136,4 +136,4 @@ TEST(RicfCommands, ErrorMessages)
     {
         delete(obj);
     }
-}
\ No newline at end of file
+}