Index: leahi_dialin/dd/modules/records_set_requests.py
===================================================================
diff -u -rbe799e12803dba3054ff893b68f8b79a9dde440b -refb383e32902c0f3ab6f9bf0b481c25a259a4e4d
--- leahi_dialin/dd/modules/records_set_requests.py	(.../records_set_requests.py)	(revision be799e12803dba3054ff893b68f8b79a9dde440b)
+++ leahi_dialin/dd/modules/records_set_requests.py	(.../records_set_requests.py)	(revision efb383e32902c0f3ab6f9bf0b481c25a259a4e4d)
@@ -20,13 +20,12 @@
 
 # Project imports
 from leahi_dialin.common import dd_enum_repository, disp_enum_repository, fp_enum_repository
-from leahi_dialin.common.generic_defs import DataTypes
 from leahi_dialin.common.msg_ids import MsgIds
 from leahi_dialin.common.override_templates import cmd_generic_override
 from leahi_dialin.protocols.CAN import CanChannels
 from leahi_dialin.utils.abstract_classes import AbstractSubSystem
 from leahi_dialin.utils.enums import DialinEnum
-from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray, byte_to_bytearray, unsigned_short_to_bytearray, string_to_bytearray
+from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray, byte_to_bytearray, string_to_bytearray
 
 
 class DDRecordsSetRequests(AbstractSubSystem):
@@ -177,7 +176,7 @@
                 # Building the kwargs parameter list
                 kwargs['sensor_enum'] = sensor
                 if sensor == dd_enum_repository.DDDialysatePumpNames.D12_PUMP:
-                    kwargs['msg_id'] = MsgIds.MSG_ID_UI_DD_NVM_SET_CAL_D12_PUMP_REQUEST
+                    kwargs['msg_id'] = MsgIds.MSG_ID_UI_DD_NVM_SET_D12_PUMP_CAL_RECORD_REQUEST
                 else:
                     kwargs['msg_id'] = msg_id_pairing[group]
                 for map in mapping:
@@ -492,9 +491,9 @@
         # Add sensor index when it's not Dialysate pump
         if msg_id not in [MsgIds.MSG_ID_UI_DD_NVM_SET_D12_PUMP_CAL_RECORD_REQUEST, MsgIds.MSG_ID_UI_DD_NVM_SET_D48_PUMP_CAL_RECORD_REQUEST]:
             if isinstance(sensor_enum, fp_enum_repository.FPPressureSensorNames):
-                payload += byte_to_bytearray(sensor_enum.value + dd_enum_repository.DDPressureSensorNames.NUM_OF_PRESSURE_SENSORS.value)
+                payload += integer_to_bytearray(sensor_enum.value + dd_enum_repository.DDPressureSensorNames.NUM_OF_PRESSURE_SENSORS.value)
             else:
-                payload += byte_to_bytearray(sensor_enum.value)
+                payload += integer_to_bytearray(sensor_enum.value)
 
         if msg_id == MsgIds.MSG_ID_UI_DD_NVM_SET_D12_PUMP_CAL_RECORD_REQUEST:
             payload += float_to_bytearray(target_speed)
@@ -533,7 +532,7 @@
                                                 bottle_temperature_c: float=0.0,
                                                 calibration_time: int=1) -> int:
 
-        payload = byte_to_bytearray(conc_enum.value)
+        payload = integer_to_bytearray(conc_enum.value)
         payload += float_to_bytearray(concentrate_mix_ratio)
         payload += float_to_bytearray(full_bottle_volume_ml)
         payload += float_to_bytearray(conductivity_uspcm)