diff --git a/commonLibs/livoxProto1/broadcastListener.cpp b/commonLibs/livoxProto1/broadcastListener.cpp
index 064d7d7..6f569a3 100644
--- a/commonLibs/livoxProto1/broadcastListener.cpp
+++ b/commonLibs/livoxProto1/broadcastListener.cpp
@@ -133,14 +133,14 @@ void BroadcastListener::start(void)
 		isListening.store(true);
 		// Start the first async receive operation
 		startReceive();
-		std::cout << "BroadcastListener started on port " << listeningPort
-			<< std::endl;
+		std::cout << __func__ << ": BroadcastListener started on port "
+			<< listeningPort << std::endl;
 	}
 	catch (const boost::system::system_error& e)
 	{
 		isListening.store(false);
-		std::cerr << "Failed to start BroadcastListener: " << e.what()
-			<< std::endl;
+		std::cerr << __func__ << ": Failed to start BroadcastListener: "
+			<< e.what() << std::endl;
 		throw;
 	}
 }
@@ -172,11 +172,11 @@ void BroadcastListener::stop(void)
 	try
 	{
 		socket.close();
-		std::cout << "BroadcastListener stopped" << std::endl;
+		std::cout << __func__ << ": BroadcastListener stopped" << std::endl;
 	}
 	catch (const boost::system::system_error& e)
 	{
-		std::cerr << "Error stopping BroadcastListener: " << e.what()
+		std::cerr << __func__ << ": Error stopping BroadcastListener: " << e.what()
 			<< std::endl;
 		throw;
 	}
diff --git a/commonLibs/livoxProto1/livoxProto1.cpp b/commonLibs/livoxProto1/livoxProto1.cpp
index d9607e6..e6adc13 100644
--- a/commonLibs/livoxProto1/livoxProto1.cpp
+++ b/commonLibs/livoxProto1/livoxProto1.cpp
@@ -45,7 +45,8 @@ void livoxProto1_destroyDeviceReq(
 			+ ": DeviceManager not initialized");
 	}
 
-	protoState.deviceManager->destroyDeviceReq(device, callback);
+	protoState.deviceManager->destroyDeviceReq(
+		device, callback);
 }
 
 void livoxProto1_main(
diff --git a/smocore/marionette/main.cpp b/smocore/marionette/main.cpp
index 7f9a5a8..be78c28 100644
--- a/smocore/marionette/main.cpp
+++ b/smocore/marionette/main.cpp
@@ -36,8 +36,10 @@ void exitMarionetteLoop()
 
 void marionetteFinalizeReqCb(bool success)
 {
-	if (!success) {
+	if (!success)
+	{
 		std::cerr << __func__ << ": Failed to finalize Marionette." << '\n';
+		// Fallthrough.
 	}
 	std::cout << __func__ << ": Marionette finalized." << '\n';
 	exitMarionetteLoop();
diff --git a/smocore/senseApis/senseApiManager.cpp b/smocore/senseApis/senseApiManager.cpp
index e9561db..e814386 100644
--- a/smocore/senseApis/senseApiManager.cpp
+++ b/smocore/senseApis/senseApiManager.cpp
@@ -357,6 +357,7 @@ public:
 		{
 			std::cerr << __func__ << ": Failed to attach device: "
 				<< spec->deviceIdentifier << "\n";
+			// Fallthrough.
 		}
 
 		if (!context->loop.incrementSuccessOrFailureAndTestForCompletionDueTo(
@@ -430,6 +431,7 @@ public:
 		{
 			std::cerr << __func__ << ": Failed to detach device: "
 				<< spec->deviceIdentifier << "\n";
+			// Fallthrough.
 		}
 
 		if (!context->loop.incrementSuccessOrFailureAndTestForCompletionDueTo(