diff --git a/Development/cmake/NmosCppLibraries.cmake b/Development/cmake/NmosCppLibraries.cmake
index ca49cd85..6a8b9245 100644
--- a/Development/cmake/NmosCppLibraries.cmake
+++ b/Development/cmake/NmosCppLibraries.cmake
@@ -30,7 +30,7 @@ target_compile_definitions(
     slog INTERFACE
     SLOG_STATIC
     SLOG_LOGGING_SEVERITY=${SLOG_LOGGING_SEVERITY}
-    BST_THREAD_BOOST # provide bst::chrono::duration, etc. using either std:: or boost:: symbols
+    BST_THREAD_BOOST
     )
 if(CMAKE_CXX_COMPILER_ID MATCHES GNU)
     if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
diff --git a/Development/nmos-cpp-node/node_implementation.cpp b/Development/nmos-cpp-node/node_implementation.cpp
index 1e074fe2..6a63152c 100644
--- a/Development/nmos-cpp-node/node_implementation.cpp
+++ b/Development/nmos-cpp-node/node_implementation.cpp
@@ -1462,7 +1462,7 @@ void node_implementation_init(nmos::node_model& model, nmos::experimental::contr
 
                     utility::ostringstream_t role;
                     role << U("sender-monitor-") << ++count;
-                    const auto& sender = nmos::find_resource(model.node_resources, sender_id);
+                    const auto sender = nmos::find_resource(model.node_resources, sender_id);
                     auto sender_monitor = nmos::make_sender_monitor(++oid, true, sender_monitors_block_oid, role.str(), nmos::fields::label(sender->data), nmos::fields::description(sender->data), value_of({ { nmos::nc::details::make_touchpoint_nmos({nmos::ncp_touchpoint_resource_types::sender, sender_id}) } }));
                     // optionally indicate dependencies within the device model
                     nmos::set_object_dependency_paths(sender_monitor, { {U("root"), U("sender-monitors")} });
diff --git a/Development/nmos/authorization_operation.cpp b/Development/nmos/authorization_operation.cpp
index d6724636..92489f6a 100644
--- a/Development/nmos/authorization_operation.cpp
+++ b/Development/nmos/authorization_operation.cpp
@@ -1271,10 +1271,8 @@ namespace nmos
 
                             authorization_service_error = true;
                         }
-                    });
-                    request.then([&]
-                    {
-                        condition.notify_all();
+
+                        model.notify();
                     });
 
                     // wait for the request because interactions with the Authorization API endpoint must be sequential
@@ -1853,10 +1851,8 @@ namespace nmos
 
                         authorization_service_error = true;
                     }
-                });
-                request.then([&]
-                {
-                    condition.notify_all();
+
+                    model.notify();
                 });
 
                 // wait for the request because interactions with the Authorization API endpoint must be sequential
@@ -1998,10 +1994,8 @@ namespace nmos
 
                         authorization_service_error = true;
                     }
-                });
-                request.then([&]
-                {
-                    condition.notify_all();
+
+                    model.notify();
                 });
 
                 // wait for the request because interactions with the Authorization API endpoint must be sequential
diff --git a/Development/nmos/node_behaviour.cpp b/Development/nmos/node_behaviour.cpp
index 971dde5d..9932d3b9 100644
--- a/Development/nmos/node_behaviour.cpp
+++ b/Development/nmos/node_behaviour.cpp
@@ -1019,7 +1019,7 @@ namespace nmos
                         }
                     }
 
-                    request = details::request_registration(*registration_client, events.at(0), gate, token).then([&](pplx::task<void> finally)
+                    request = details::request_registration(*registration_client, events.at(0), gate, token).then([&, id_type, event_type](pplx::task<void> finally)
                     {
                         auto lock = model.write_lock(); // in order to update local state