diff --git a/CMakeLists.txt b/CMakeLists.txt
index b271fcc517d377a834dc33b9b05fdf9845a38b8d..24b0ac0575475a314b3cb9d9827cf043a91e076d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,7 +98,8 @@ if (APPLE)
    if (NOT ACCELERATE)
       message(FATAL_ERROR "Accelearate not found")
       endif()
-      target_link_libraries(rapidmixTest RAPID-MIX_API ${ACCELERATE})
+      target_link_libraries(RAPID-MIX_API ${ACCELERATE})
+      target_link_libraries(rapidmixTest RAPID-MIX_API)
 else()
 	target_link_libraries(rapidmixTest RAPID-MIX_API)
 endif()
diff --git a/src/machineLearning/trainingData.cpp b/src/machineLearning/trainingData.cpp
index ba209e7bdad03d4c1b48685f1a5fc65bf5ebc65f..f81d11fad4aaf14315a562aac12c37f82fab5659 100644
--- a/src/machineLearning/trainingData.cpp
+++ b/src/machineLearning/trainingData.cpp
@@ -47,7 +47,7 @@ namespace rapidmix {
         newElement.uniqueId = assignCurrentId();
         newElement.input = input;
         newElement.output = output;
-        newElement.timeStamp = NULL;
+        newElement.timeStamp = 0.0;
         trainingSet[targetPhrase].elements.push_back(newElement);
         return newElement.uniqueId;
     }
@@ -56,7 +56,7 @@ namespace rapidmix {
         element newElement;
         newElement.uniqueId = assignCurrentId();
         newElement.input = input;
-        newElement.timeStamp = NULL;
+        newElement.timeStamp = 0.0;
         trainingSet[targetPhrase].elements.push_back(newElement);
         return newElement.uniqueId;
     }