diff --git a/CMakeModules/download_boost.cmake b/CMakeModules/download_boost.cmake
index bf43e685d6..7745ded765 100644
--- a/CMakeModules/download_boost.cmake
+++ b/CMakeModules/download_boost.cmake
@@ -40,9 +40,15 @@ set( BOOST_ROOT "${PROJECT_SOURCE_DIR}/boost_root" )
 # Space separated list which indicates the subset of boost libraries to compile.
 # Chosen libraries are based on AVHTTP requirements, and possibly
 # unit_test_framework for its own worth.
-# tool_manager.cpp -> coroutine -> context (_jump_fcontext)
+# tool_manager.cpp -> coroutine -> context (_jump_fcontext) (on OSX)
+if( APPLE )
+    set( BOOST_EXTRA_LIBS "context" )
+else()
+    set( BOOST_EXTRA_LIBS "" )
+endif()
+
 set( BOOST_LIBS_BUILT
-    context
+    ${BOOST_EXTRA_LIBS}
     #coroutine
     date_time
     #exception
diff --git a/eeschema/schematic_undo_redo.cpp b/eeschema/schematic_undo_redo.cpp
index 2d6dbba449..2312cae2b1 100644
--- a/eeschema/schematic_undo_redo.cpp
+++ b/eeschema/schematic_undo_redo.cpp
@@ -269,7 +269,7 @@ void SCH_EDIT_FRAME::PutDataInPreviousState( PICKED_ITEMS_LIST* aList, bool aRed
     for( int ii = aList->GetCount() - 1; ii >= 0; ii--  )
     {
         item = (SCH_ITEM*) aList->GetPickedItem( ii );
-        wxAssert( item );
+        wxASSERT( item );
 
         item->ClearFlags();