diff --git a/dependencies/RapidLib b/dependencies/RapidLib
index 9c0902d41c767bb28386463435c805a62fed525e..5e0190d65d2204ad2fae48a5120b8c2191c7d106 160000
--- a/dependencies/RapidLib
+++ b/dependencies/RapidLib
@@ -1 +1 @@
-Subproject commit 9c0902d41c767bb28386463435c805a62fed525e
+Subproject commit 5e0190d65d2204ad2fae48a5120b8c2191c7d106
diff --git a/src/machineLearning/trainingData.h b/src/machineLearning/trainingData.h
index 2d099043e2197a5814cb803358aa144e7ef8f576..7ff97b4ffcb8f181501bfe289462fc0003f22658 100644
--- a/src/machineLearning/trainingData.h
+++ b/src/machineLearning/trainingData.h
@@ -57,7 +57,7 @@ namespace rapidmix {
         
         //TODO: Deleting phrases (last or by label)
         //Design ideas to make phrase building stateless:
-        std::vector<phrase>::iterator createNewPhrase();
+        std::vector<phrase>::iterator createNewPhrase(); //??? Do we need this?
         std::vector<phrase>::iterator createNewPhrase(std::string label);
         
         /** Create a new phrase that can be recorded into. Returns phrase id */
diff --git a/src/rapidmix.h b/src/rapidmix.h
index 4afa45f06baa9f33e6fcfcd5f8e257727c9356c7..fa3e13e5b699fd18d683c326f34ca3c45d142682 100644
--- a/src/rapidmix.h
+++ b/src/rapidmix.h
@@ -41,8 +41,8 @@
 #define RAPIDMIX_VERSION "2.2.0"
 #define RAPIDMIX_REVISION "27-SEPTEMBER-2017"
 
-#include "machineLearning.h"
-#include "trainingData.h"
-#include "signalProcessing.h"
+#include "machineLearning/machineLearning.h"
+#include "machineLearning/trainingData.h"
+#include "signalProcessing/signalProcessing.h"
 
 #endif
diff --git a/tests/test_project.xcodeproj/project.pbxproj b/tests/test_project.xcodeproj/project.pbxproj
index d15866efe13bda1fac24a23c01b867e4b25cd115..0c5ee8b2f3b75342fce9133890e0c70a28e84727 100644
--- a/tests/test_project.xcodeproj/project.pbxproj
+++ b/tests/test_project.xcodeproj/project.pbxproj
@@ -1283,6 +1283,7 @@
 		0BFFEF2B1E56083D00EF19A5 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				GCC_C_LANGUAGE_STANDARD = c11;
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -1291,6 +1292,7 @@
 		0BFFEF2C1E56083D00EF19A5 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				GCC_C_LANGUAGE_STANDARD = c11;
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};