diff --git a/Sources/Plasma/CoreLib/plFormat.cpp b/Sources/Plasma/CoreLib/plFormat.cpp
index ea5a6302..110f9b32 100644
--- a/Sources/Plasma/CoreLib/plFormat.cpp
+++ b/Sources/Plasma/CoreLib/plFormat.cpp
@@ -388,9 +388,7 @@ _PL_FORMAT_IMPL_INT_TYPE(signed char, unsigned char)
 _PL_FORMAT_IMPL_INT_TYPE(short, unsigned short)
 _PL_FORMAT_IMPL_INT_TYPE(int, unsigned)
 _PL_FORMAT_IMPL_INT_TYPE(long, unsigned long)
-#if (SIZEOF_LONG == 4)
-_PL_FORMAT_IMPL_INT_TYPE(int64_t, uint64_t)
-#endif
+_PL_FORMAT_IMPL_INT_TYPE(long long, unsigned long long)
 
 PL_FORMAT_IMPL(float)
 {
diff --git a/Sources/Plasma/CoreLib/plFormat.h b/Sources/Plasma/CoreLib/plFormat.h
index b01ae78e..ad3cb594 100644
--- a/Sources/Plasma/CoreLib/plFormat.h
+++ b/Sources/Plasma/CoreLib/plFormat.h
@@ -188,10 +188,8 @@ namespace plFormat_Private
     PL_FORMAT_TYPE(unsigned)
     PL_FORMAT_TYPE(long)
     PL_FORMAT_TYPE(unsigned long)
-#if (SIZEOF_LONG == 4)
-    PL_FORMAT_TYPE(int64_t)
-    PL_FORMAT_TYPE(uint64_t)
-#endif
+    PL_FORMAT_TYPE(long long)
+    PL_FORMAT_TYPE(unsigned long long)
 
     PL_FORMAT_TYPE(float)
     PL_FORMAT_TYPE(double)
diff --git a/cmake/CompilerChecks.cmake b/cmake/CompilerChecks.cmake
index 5d00809a..8b7e21fb 100644
--- a/cmake/CompilerChecks.cmake
+++ b/cmake/CompilerChecks.cmake
@@ -1,11 +1,14 @@
 # Detect Clang compiler
-if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+if("${CMAKE_CXX_COMPILER_ID}" MATCHES ".*Clang")
     set(CMAKE_COMPILER_IS_CLANGXX 1)
 endif()
 
 # Require C++11
 if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+    if(APPLE)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
+    endif()
 endif()