Index: leahi_dialin/td/modules/buttons.py
===================================================================
diff -u -rf03c9a32180573f2430105ad69eb91d9f597a96b -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943
--- leahi_dialin/td/modules/buttons.py	(.../buttons.py)	(revision f03c9a32180573f2430105ad69eb91d9f597a96b)
+++ leahi_dialin/td/modules/buttons.py	(.../buttons.py)	(revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943)
@@ -8,16 +8,19 @@
 # @file    buttons.py
 #
 # @author  (last)      Zoltan Miskolci
-# @date    (last)      08-Jan-2026
+# @date    (last)      05-May-2026
 # @author  (original)  Peter Lucia
 # @date    (original)  14-Oct-2024
 #
 ############################################################################
 
-import struct
+# Module imports
 from logging import Logger
+import struct
 
+# Project imports
 from leahi_dialin.common.constants import NO_RESET
+from leahi_dialin.common.generic_defs import DataTypes
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.common.override_templates import cmd_generic_override
 from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels
@@ -42,10 +45,9 @@
         self.logger = logger
 
         if self.can_interface is not None:
-            self.msg_id_off_button_press_request = MsgIds.MSG_ID_OFF_BUTTON_PRESS_REQUEST.value
-            self.can_interface.register_receiving_publication_function(DenaliChannels.td_to_ui_ch_id,
-                                                                       self.msg_id_off_button_press_request,
-                                                                       self._handler_poweroff_timeout_occurred)
+            self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_to_ui_ch_id,
+                                                                       message_id = MsgIds.MSG_ID_OFF_BUTTON_PRESS_REQUEST.value,
+                                                                       function = self._handler_poweroff_timeout_occurred)
 
         self.td_power_off_timestamp = 0.0                       #: The timestamp of the last message
         self.poweroff_timeout_expired = False                   #: The Power Off timeout value
@@ -72,7 +74,7 @@
             self.logger.debug("Poweroff message id detected, but was the wrong length.")
             return
 
-        mode = struct.unpack('h', bytearray(
+        mode = struct.unpack(DataTypes.U16.unpack_attrib(), bytearray(
             message["message"][MsgFieldPositions.START_POS_FIELD_1: MsgFieldPositions.START_POS_FIELD_1 + 2]))
 
         if len(mode) > 0: