diff --git a/Demos/SerializeDemo/SerializeDemo.cpp b/Demos/SerializeDemo/SerializeDemo.cpp
index 704cf8b3b..9b6117cc6 100644
--- a/Demos/SerializeDemo/SerializeDemo.cpp
+++ b/Demos/SerializeDemo/SerializeDemo.cpp
@@ -739,7 +739,6 @@ SerializeDemo::~SerializeDemo()
 
 void	SerializeDemo::initPhysics()
 {
-	m_idle = true;
 	setTexturing(true);
 	setShadows(true);
 
diff --git a/Demos/SharedOpenCL/btOpenCLUtils.cpp b/Demos/SharedOpenCL/btOpenCLUtils.cpp
index 5b7b6e23e..318e6d259 100644
--- a/Demos/SharedOpenCL/btOpenCLUtils.cpp
+++ b/Demos/SharedOpenCL/btOpenCLUtils.cpp
@@ -24,13 +24,12 @@ subject to the following restrictions:
 
 #define BT_MAX_CL_DEVICES 16 //who needs 16 devices?
 //#define BT_USE_CACHE_DIR
-
 #ifdef _WIN32
 #include <Windows.h>
-#include <assert.h>
+#endif //_WIN32
 
+#include <assert.h>
 #define btAssert assert
-#endif
 
 //Set the preferred platform vendor using the OpenCL SDK
 static char* spPlatformVendor = 
@@ -514,12 +513,11 @@ cl_program btOpenCLUtils::compileCLProgramFromFile(cl_context clContext, cl_devi
 
 	cl_program m_cpProgram=0;
 	cl_int status;
-
 	char binaryFileName[522];
 
 	if (clFileNameForCaching)
 	{
-		
+#ifdef _WIN32	
 		char deviceName[256];
 		char driverVersion[256];
 		clGetDeviceInfo(device, CL_DEVICE_NAME, 256, &deviceName, NULL);
@@ -541,7 +539,6 @@ cl_program btOpenCLUtils::compileCLProgramFromFile(cl_context clContext, cl_devi
 
 		FILETIME modtimeBinary; 
 
-#ifdef _WIN32
 #ifdef BT_USE_CACHE_DIR
 		CreateDirectory("cache",0);
 #endif //BT_USE_CACHE_DIR
diff --git a/config.h.in b/config.h.in
index 043b7bba6..11b564d03 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,5 +1,8 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
+
 /* Architecture is PowerPC */
 #undef ARCH_PPC
 
@@ -76,6 +79,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
@@ -94,6 +100,14 @@
 /* Version number of package */
 #undef VERSION
 
-/* Define to 1 if your processor stores words with the most significant byte
-   first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif