diff --git a/examples/seeder_example/vt_application.cpp b/examples/seeder_example/vt_application.cpp
index 70f41465..8b844be0 100644
--- a/examples/seeder_example/vt_application.cpp
+++ b/examples/seeder_example/vt_application.cpp
@@ -360,7 +360,7 @@ void SeederVtApplication::update()
 		VTClientUpdateHelper.set_numeric_value(tcSupportedSections_VarNum, TCClientInterface.get_connected_tc_number_sections_supported());
 		VTClientUpdateHelper.set_numeric_value(tcVersion_VarNum, static_cast<std::uint32_t>(TCClientInterface.get_connected_tc_version()));
 
-		if ((0 == speedMessages.get_number_received_machine_selected_speed_command_sources()) &&
+		if ((0 == speedMessages.get_number_received_machine_selected_speed_sources()) &&
 		    (0 == speedMessages.get_number_received_ground_based_speed_sources()) &&
 		    (0 == speedMessages.get_number_received_wheel_based_speed_sources()))
 		{
@@ -688,7 +688,7 @@ void SeederVtApplication::update_alarms()
 	if (VTClientInterface->get_is_connected() && VTClientUpdateHelper.get_numeric_value(enableAlarms_VarNum))
 	{
 		// Check if we have a speed source
-		if ((0 == speedMessages.get_number_received_machine_selected_speed_command_sources()) &&
+		if ((0 == speedMessages.get_number_received_machine_selected_speed_sources()) &&
 		    (0 == speedMessages.get_number_received_ground_based_speed_sources()) &&
 		    (0 == speedMessages.get_number_received_wheel_based_speed_sources()))
 		{
diff --git a/isobus/src/isobus_virtual_terminal_client_update_helper.cpp b/isobus/src/isobus_virtual_terminal_client_update_helper.cpp
index e6cf653b..c165e0fd 100644
--- a/isobus/src/isobus_virtual_terminal_client_update_helper.cpp
+++ b/isobus/src/isobus_virtual_terminal_client_update_helper.cpp
@@ -44,7 +44,7 @@ namespace isobus
 		}
 		if (numericValueStates.find(object_id) == numericValueStates.end())
 		{
-			LOG_WARNING("[VTStateHelper] set_numeric_value: objectId %lu not tracked", object_id);
+			LOG_WARNING("[VTStateHelper] set_numeric_value: objectId %hu not tracked", object_id);
 			return false;
 		}
 		if (numericValueStates.at(object_id) == value)
@@ -127,7 +127,7 @@ namespace isobus
 		}
 		if (softKeyMasks.find(maskId) == softKeyMasks.end())
 		{
-			LOG_WARNING("[VTStateHelper] set_active_soft_key_mask: data/alarm mask '%lu' not tracked", maskId);
+			LOG_WARNING("[VTStateHelper] set_active_soft_key_mask: data/alarm mask '%hu' not tracked", maskId);
 			return false;
 		}
 		if (softKeyMasks.at(maskId) == softKeyMaskId)
@@ -152,12 +152,12 @@ namespace isobus
 		}
 		if (attributeStates.find(objectId) == attributeStates.end())
 		{
-			LOG_ERROR("[VTStateHelper] set_attribute: objectId %lu not tracked", objectId);
+			LOG_ERROR("[VTStateHelper] set_attribute: objectId %hu not tracked", objectId);
 			return false;
 		}
 		if (attributeStates.at(objectId).find(attribute) == attributeStates.at(objectId).end())
 		{
-			LOG_WARNING("[VTStateHelper] set_attribute: attribute %lu of objectId %lu not tracked", attribute, objectId);
+			LOG_WARNING("[VTStateHelper] set_attribute: attribute %hhu of objectId %hu not tracked", attribute, objectId);
 			return false;
 		}
 		if (attributeStates.at(objectId).at(attribute) == value)