diff --git a/src/CMakeData-arch.cmake b/src/CMakeData-arch.cmake
index e62cf36dc55..44ef3bc0445 100644
--- a/src/CMakeData-arch.cmake
+++ b/src/CMakeData-arch.cmake
@@ -338,8 +338,7 @@ list(APPEND SMDATA_ARCH_LIGHTS_HPP
   "arch/Lights/LightsDriver_EXTIO.h"
 )
 
-# TODO: Confirm if Apple can use the export.
-if(NOT APPLE)
+if(NOT WIN32)
   list(APPEND SMDATA_ARCH_LIGHTS_SRC
     "arch/Lights/LightsDriver_Export.cpp"
   )
@@ -394,7 +393,7 @@ if(NOT APPLE)
       endif()
     endif()
   endif(WIN32)
-endif(NOT APPLE)
+endif(NOT WIN32)
 
 source_group("Arch Specific\\\\Lights" FILES ${SMDATA_ARCH_LIGHTS_SRC} ${SMDATA_ARCH_LIGHTS_HPP})
 
diff --git a/src/CMakeData-singletons.cmake b/src/CMakeData-singletons.cmake
index 36569297932..7a83ee9af06 100644
--- a/src/CMakeData-singletons.cmake
+++ b/src/CMakeData-singletons.cmake
@@ -56,9 +56,11 @@ list(APPEND SMDATA_GLOBAL_SINGLETON_HPP
 if(WITH_NETWORKING)
   list(APPEND SMDATA_GLOBAL_SINGLETON_SRC
     "ezsockets.cpp"
+    "HTTPHelper.cpp"
   )
   list(APPEND SMDATA_GLOBAL_SINGLETON_HPP
     "ezsockets.h"
+    "HTTPHelper.h"
   )
 endif()
 
diff --git a/src/TimingData.h b/src/TimingData.h
index 8d2eaaecae2..e0ca90ad23a 100644
--- a/src/TimingData.h
+++ b/src/TimingData.h
@@ -15,7 +15,7 @@ template<class T>
 inline T ToDerived( const TimingSegment *t, TimingSegmentType tst )
 {
 	ASSERT_M( t && tst == t->GetType(),
-		sprintf("type mismatch (expected %s, got %s)",
+		ssprintf("type mismatch (expected %s, got %s)",
 		TimingSegmentTypeToString(tst).c_str(),
 		TimingSegmentTypeToString(t->GetType()).c_str() ) );