diff --git a/DLL430_v3/src/DLL430_OldApiV3.cpp b/DLL430_v3/src/DLL430_OldApiV3.cpp
index c0ebbe0..71e5c5e 100644
--- a/DLL430_v3/src/DLL430_OldApiV3.cpp
+++ b/DLL430_v3/src/DLL430_OldApiV3.cpp
@@ -302,7 +302,7 @@ bool DLL430_OldApiV3::Initialize(char* port, long* version)
 	}
 
 	if(notifyCallback!=NULL)
-		handle->addSystemNotifyCallback( boost::bind(&DLL430_OldApiV3::iNotifyCallback, this, _1, _2, _3, _4) );
+		handle->addSystemNotifyCallback( boost::bind(&DLL430_OldApiV3::iNotifyCallback, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3, boost::placeholders::_4) );
 
 	if (version)		// pointer not 0
 	{
@@ -332,7 +332,7 @@ bool DLL430_OldApiV3::SetSystemNotfyCallback(SYSTEM_NOTIFY_CALLBACK parSystemNot
 	
 	if(handle && singleDevice)
 	{
-		handle->addSystemNotifyCallback( boost::bind(&DLL430_OldApiV3::iNotifyCallback, this, _1, _2, _3, _4) );
+		handle->addSystemNotifyCallback( boost::bind(&DLL430_OldApiV3::iNotifyCallback, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3, boost::placeholders::_4) );
 		
 		if ( DebugManager* db_man = singleDevice->getDebugManager() )
 		{
@@ -2769,7 +2769,7 @@ bool DLL430_OldApiV3::FET_FwUpdate(
 	}
 
 	ConfigManager *config = handle->getConfigManager();
-	bool success = config->firmWareUpdate(lpszFileName, boost::bind(callback, _1, _2, _3, clientHandle));
+	bool success = config->firmWareUpdate(lpszFileName, boost::bind(callback, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3, clientHandle));
 	
 	//Only perform retries when not using user specified file
 	int retries = 2;
@@ -2781,7 +2781,7 @@ bool DLL430_OldApiV3::FET_FwUpdate(
 		{
 			//Initialize will invalidate the old config manager
 			config = handle->getConfigManager();
-			success = config->firmWareUpdate(lpszFileName, boost::bind(callback, _1, _2, _3, clientHandle));
+			success = config->firmWareUpdate(lpszFileName, boost::bind(callback, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3, clientHandle));
 		}
 	}
 
diff --git a/DLL430_v3/src/TI/DLL430/DebugManagerV3.cpp b/DLL430_v3/src/TI/DLL430/DebugManagerV3.cpp
index ca2724c..5f52af5 100644
--- a/DLL430_v3/src/TI/DLL430/DebugManagerV3.cpp
+++ b/DLL430_v3/src/TI/DLL430/DebugManagerV3.cpp
@@ -94,19 +94,19 @@ DebugManagerV3::DebugManagerV3 (DeviceHandleV3* parent, const DeviceInfo* devInf
  , resetCycleCounterBeforeNextStep(true)
  , storagePollingActive(false)
 {
-	this->waitForEem.setCallBack( boost::bind(&DebugManagerV3::localCallback, this, _1, _2), 0 );
+	this->waitForEem.setCallBack( boost::bind(&DebugManagerV3::localCallback, this, boost::placeholders::_1, boost::placeholders::_2), 0 );
 	this->waitForEem.setAsyncMode(false);
 
-	this->waitForJState.setCallBack( boost::bind(&DebugManagerV3::localCallback, this, _1, _2), 0 );
+	this->waitForJState.setCallBack( boost::bind(&DebugManagerV3::localCallback, this, boost::placeholders::_1, boost::placeholders::_2), 0 );
 	this->waitForJState.setAsyncMode(true);
 
-	this->waitForStorage.setCallBack( boost::bind(&DebugManagerV3::localCallback, this, _1, _2), 0 );
+	this->waitForStorage.setCallBack( boost::bind(&DebugManagerV3::localCallback, this, boost::placeholders::_1, boost::placeholders::_2), 0 );
 	this->waitForStorage.setAsyncMode(true);
 
 	createModuleStrings(devInfo->getClockMapping());
 	createClockStrings(devInfo->getClockNames());
 
-	eventNotifier.setEventHandler( boost::bind(&DebugManagerV3::runEvent, this, _1) );
+	eventNotifier.setEventHandler( boost::bind(&DebugManagerV3::runEvent, this, boost::placeholders::_1) );
 	eventNotifier.startProcessingEvents();
 }
 
diff --git a/DLL430_v3/src/TI/DLL430/EM/EmulationManager/EmulationManager430.cpp b/DLL430_v3/src/TI/DLL430/EM/EmulationManager/EmulationManager430.cpp
index a9381d7..6412273 100644
--- a/DLL430_v3/src/TI/DLL430/EM/EmulationManager/EmulationManager430.cpp
+++ b/DLL430_v3/src/TI/DLL430/EM/EmulationManager/EmulationManager430.cpp
@@ -135,43 +135,43 @@ VariableWatchPtr EmulationManager430::getVariableWatch() const
 
 bool EmulationManager430::hasTriggerConditionManager() const 
 {
-	return mTriggerConditionManager;
+	return mTriggerConditionManager.get(); // JMF
 }
 
 
 bool EmulationManager430::hasBreakpointManager() const 
 {
-	return mBreakpointManager;
+	return mBreakpointManager.get(); // JMF
 }
 
 
 bool EmulationManager430::hasClockControl() const 
 {
-	return mClockControl;
+	return mClockControl.get(); // JMF
 }
 
 
 bool EmulationManager430::hasCycleCounter() const 
 {
-	return mCycleCounter;
+	return mCycleCounter.get(); // JMF
 }
 
 
 bool EmulationManager430::hasSequencer() const 
 {
-	return mSequencer;
+	return mSequencer.get(); // JMF
 }
 
 
 bool EmulationManager430::hasTrace() const 
 {
-	return mTrace;
+	return mTrace.get(); // JMF
 }
 
 
 bool EmulationManager430::hasVariableWatch() const 
 {
-	return mVariableWatch;
+	return mVariableWatch.get();
 }
 
 
diff --git a/DLL430_v3/src/TI/DLL430/TemplateDeviceDb/DatabaseImplementation.h b/DLL430_v3/src/TI/DLL430/TemplateDeviceDb/DatabaseImplementation.h
index fe5265b..6610de3 100644
--- a/DLL430_v3/src/TI/DLL430/TemplateDeviceDb/DatabaseImplementation.h
+++ b/DLL430_v3/src/TI/DLL430/TemplateDeviceDb/DatabaseImplementation.h
@@ -43,7 +43,7 @@
 #endif
 
 #include <vector>
-#include <boost/tr1/tuple.hpp>
+#include <boost/tuple/tuple.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/assign/list_of.hpp>
 
diff --git a/DLL430_v3/src/TI/DLL430/UsbCdcIoChannel.cpp b/DLL430_v3/src/TI/DLL430/UsbCdcIoChannel.cpp
index 02c7e91..9beec77 100644
--- a/DLL430_v3/src/TI/DLL430/UsbCdcIoChannel.cpp
+++ b/DLL430_v3/src/TI/DLL430/UsbCdcIoChannel.cpp
@@ -315,12 +315,18 @@ bool UsbCdcIoChannel::isOpen ()
 
 boost::mutex readWriteMutex;
 
+#if BOOST_VERSION >= 107000
+#define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context())
+#else
+#define GET_IO_SERVICE(s) ((s).get_io_service())
+#endif
+
 class AsyncTransferHandler
 {
 public:	
 	AsyncTransferHandler(serial_port& port) : 
 		port(port), 
-		timer(port.get_io_service()), 
+		timer(GET_IO_SERVICE(port)), 
 		result(RES_NONE), 
 		bytesTransfered(0) {}
 
@@ -332,11 +338,11 @@ class AsyncTransferHandler
 		async_read(port, buffer(buf, bufSize),
 				 boost::bind(&AsyncTransferHandler::onTransferComplete, this, _1, _2) );
 
-		port.get_io_service().reset();
+		GET_IO_SERVICE(port).reset();
 
 #if defined(_WIN32) || defined(_WIN64)
 		while ( result == RES_NONE )
-			port.get_io_service().run_one();
+			GET_IO_SERVICE(port).run_one();
 
 		if (result != RES_COMPLETE)
 		{
@@ -349,9 +355,9 @@ class AsyncTransferHandler
 			timer.cancel();
 #else
 		while ( result == RES_NONE )
-			port.get_io_service().run();
+			GET_IO_SERVICE(port).run();
 #endif
-		port.get_io_service().stop();
+		GET_IO_SERVICE(port).stop();
 
 		return (result == RES_COMPLETE) ? static_cast<int>(bytesTransfered) : -1;
 	}	
diff --git a/DLL430_v3/src/TI/DLL430/UsbCdcIoChannel.h b/DLL430_v3/src/TI/DLL430/UsbCdcIoChannel.h
index b6531a9..e519396 100644
--- a/DLL430_v3/src/TI/DLL430/UsbCdcIoChannel.h
+++ b/DLL430_v3/src/TI/DLL430/UsbCdcIoChannel.h
@@ -79,7 +79,8 @@ namespace TI
 			std::string name;
 			bool isXoffFlowOn;
 			Status status;
-			boost::asio::io_service* ioService;
+			// boost::asio::io_service* ioService;
+			boost::asio::io_context* ioService;
 			boost::asio::serial_port* port;
 			ComState comState;