diff --git a/bacnet-stack/demo/handler/h_rpm.c b/bacnet-stack/demo/handler/h_rpm.c
index 04ee0832..63899403 100644
--- a/bacnet-stack/demo/handler/h_rpm.c
+++ b/bacnet-stack/demo/handler/h_rpm.c
@@ -57,7 +57,7 @@ void handler_rpm_list_set(
 
 static uint8_t Temp_Buf[MAX_APDU] = { 0 };
 
-static int RPM_Object_Property(
+static BACNET_PROPERTY_ID RPM_Object_Property(
     struct special_property_list_t *pPropertyList,
     BACNET_PROPERTY_ID special_property,
     unsigned index)
@@ -88,7 +88,7 @@ static int RPM_Object_Property(
         }
     }
 
-    return property;
+    return (BACNET_PROPERTY_ID)property;
 }
 
 static unsigned RPM_Object_Property_Count(
@@ -143,9 +143,9 @@ static int RPM_Encode_Property(
         rpdata.object_property = object_property;
         rpdata.array_index = array_index;
         rpdata.application_data = &Temp_Buf[0];
-        rpdata.application_data_len = sizeof(Temp_Buf);        
+        rpdata.application_data_len = sizeof(Temp_Buf);
         len = Read_Property_Function(&rpdata);
-    }    
+    }
     if (len < 0) {
         /* error was returned - encode that for the response */
         len =
diff --git a/bacnet-stack/demo/object/bo.c b/bacnet-stack/demo/object/bo.c
index 995e8869..cc3e6d25 100644
--- a/bacnet-stack/demo/object/bo.c
+++ b/bacnet-stack/demo/object/bo.c
@@ -156,7 +156,7 @@ unsigned Binary_Output_Instance_To_Index(
     return index;
 }
 
-static BACNET_BINARY_PV Binary_Output_Present_Value(
+BACNET_BINARY_PV Binary_Output_Present_Value(
     uint32_t object_instance)
 {
     BACNET_BINARY_PV value = RELINQUISH_DEFAULT;