diff --git a/bacnet-stack/demo/handler/h_whohas.c b/bacnet-stack/demo/handler/h_whohas.c
index 30ea436e..fff0f8bf 100644
--- a/bacnet-stack/demo/handler/h_whohas.c
+++ b/bacnet-stack/demo/handler/h_whohas.c
@@ -65,7 +65,8 @@ static void match_name_or_object(
     } else {
         /* valid object_name copy in my device? */
         found =
-            Device_Object_Name_Copy(data->object.identifier.type,
+            Device_Object_Name_Copy(
+            (BACNET_OBJECT_TYPE)data->object.identifier.type,
             data->object.identifier.instance, &object_name);
         if (found) {
             Send_I_Have(Device_Object_Instance_Number(),
diff --git a/bacnet-stack/ports/bdk-atxx4-mstp/device.c b/bacnet-stack/ports/bdk-atxx4-mstp/device.c
index 51083af6..0317fd3e 100644
--- a/bacnet-stack/ports/bdk-atxx4-mstp/device.c
+++ b/bacnet-stack/ports/bdk-atxx4-mstp/device.c
@@ -588,7 +588,7 @@ bool Device_Valid_Object_Name(
     for (i = 0; i < max_objects; i++) {
         check_id = Device_Object_List_Identifier(i, &type, &instance);
         if (check_id) {
-            pObject = Device_Objects_Find_Functions(type);
+            pObject = Device_Objects_Find_Functions((BACNET_OBJECT_TYPE)type);
             if ((pObject != NULL) && (pObject->Object_Name != NULL) &&
                 (pObject->Object_Name(instance, &object_name2) &&
                     characterstring_same(object_name1, &object_name2))) {
@@ -614,7 +614,7 @@ bool Device_Valid_Object_Id(
     bool status = false;        /* return value */
     struct my_object_functions *pObject = NULL;
 
-    pObject = Device_Objects_Find_Functions(object_type);
+    pObject = Device_Objects_Find_Functions((BACNET_OBJECT_TYPE)object_type);
     if ((pObject != NULL) && (pObject->Object_Valid_Instance != NULL)) {
         status = pObject->Object_Valid_Instance(object_instance);
     }