diff --git a/Base/test/TestVector.cpp b/Base/test/TestVector.cpp
index b550751..e66b660 100644
--- a/Base/test/TestVector.cpp
+++ b/Base/test/TestVector.cpp
@@ -64,7 +64,7 @@ TEST(VectorBase, Constructors) {
   for(int i = 0; i < 7; i++)
 	v7i[i] = -i;
   FasTC::VectorBase<unsigned, 16> v16u;
-  for(int i = 0; i < 7; i++)
+  for(int i = 0; i < 16; i++)
 	v16u[i] = i;
 
 #define TEST_VECTOR_COPY_CONS(v, t, n)          \
diff --git a/Core/src/ThreadPThread.cpp b/Core/src/ThreadPThread.cpp
index e55da1c..de7b871 100644
--- a/Core/src/ThreadPThread.cpp
+++ b/Core/src/ThreadPThread.cpp
@@ -140,6 +140,8 @@ void TCThread::Yield() {
 uint64 TCThread::ThreadID() {
 #ifdef __MINGW32__
   return static_cast<uint64>(pthread_self().x);
+#elif defined __APPLE__
+  return reinterpret_cast<uint64>(pthread_self());
 #else
   return static_cast<uint64>(pthread_self());
 #endif