diff --git a/inc/Services/FunctionManagementService.hpp b/inc/Services/FunctionManagementService.hpp
index 266e65468bbbfaabf3356cea4ddadb92018b8871..512ce3e39c71475915cfaf2bde38ee0a30d491fc 100644
--- a/inc/Services/FunctionManagementService.hpp
+++ b/inc/Services/FunctionManagementService.hpp
@@ -98,7 +98,7 @@ public:
 	 * @note This function is called from the main execute() that is defined in the file MessageParser.hpp
 	 * @param param Contains the necessary parameters to call the suitable subservice
 	 */
-	void execute(Message& param);
+	void execute(Message& message);
 };
 
 #endif // ECSS_SERVICES_FUNCTIONMANAGEMENTSERVICE_HPP
diff --git a/src/Services/FunctionManagementService.cpp b/src/Services/FunctionManagementService.cpp
index 96f7a2a8e250053f56ce1c8e456d53a836e34e76..88f1a338ce9ad17c63216de8dd15f4f7851f9f0c 100644
--- a/src/Services/FunctionManagementService.cpp
+++ b/src/Services/FunctionManagementService.cpp
@@ -53,5 +53,6 @@ void FunctionManagementService::execute(Message& message) {
 			break;
 		default:
 			ErrorHandler::reportInternalError(ErrorHandler::OtherMessageType);
+			break;
 	}
 }
diff --git a/src/Services/TimeManagementService.cpp b/src/Services/TimeManagementService.cpp
index 832cc31f30eca2e6d52efd710b591dc605eaeaa7..0cf015f7beb741832ea599c36adfd817bf5a017e 100644
--- a/src/Services/TimeManagementService.cpp
+++ b/src/Services/TimeManagementService.cpp
@@ -32,5 +32,6 @@ void TimeManagementService::execute(Message& message) {
 			break;
 		default:
 			ErrorHandler::reportInternalError(ErrorHandler::OtherMessageType);
+			break;
 	}
 }