diff --git a/src/bacnet/abort.c b/src/bacnet/abort.c
index 123f42c7..bd2f757d 100644
--- a/src/bacnet/abort.c
+++ b/src/bacnet/abort.c
@@ -159,8 +159,7 @@ BACNET_ERROR_CODE abort_convert_to_error_code(BACNET_ABORT_REASON abort_code)
             error_code = ERROR_CODE_ABORT_APDU_TOO_LONG;
             break;
         default:
-            if ((abort_code >= ABORT_REASON_PROPRIETARY_FIRST) &&
-                (abort_code <= ABORT_REASON_PROPRIETARY_LAST)) {
+            if (abort_code >= ABORT_REASON_PROPRIETARY_FIRST) {
                 error_code = ERROR_CODE_ABORT_PROPRIETARY;
             }
             break;
diff --git a/src/bacnet/bacapp.c b/src/bacnet/bacapp.c
index 1988867f..777cdc88 100644
--- a/src/bacnet/bacapp.c
+++ b/src/bacnet/bacapp.c
@@ -954,7 +954,7 @@ int bacapp_encode_context_data_value(
 BACNET_APPLICATION_TAG
 bacapp_context_tag_type(BACNET_PROPERTY_ID property, uint8_t tag_number)
 {
-    BACNET_APPLICATION_TAG tag = MAX_BACNET_APPLICATION_TAG;
+    int tag = MAX_BACNET_APPLICATION_TAG;
 
     (void)tag_number;
     tag = bacapp_known_property_tag(MAX_BACNET_OBJECT_TYPE, property);
@@ -962,7 +962,7 @@ bacapp_context_tag_type(BACNET_PROPERTY_ID property, uint8_t tag_number)
         tag = MAX_BACNET_APPLICATION_TAG;
     }
 
-    return tag;
+    return (BACNET_APPLICATION_TAG)tag;
 }
 
 /**
@@ -1615,7 +1615,7 @@ int bacapp_decode_known_property(
     BACNET_PROPERTY_ID property)
 {
     int apdu_len = 0;
-    BACNET_APPLICATION_TAG tag;
+    int tag;
 
     if (bacnet_is_closing_tag(apdu, apdu_size)) {
         if (value) {
diff --git a/src/bacnet/basic/object/ms-input.c b/src/bacnet/basic/object/ms-input.c
index 055a2ae5..2c3ebeb9 100644
--- a/src/bacnet/basic/object/ms-input.c
+++ b/src/bacnet/basic/object/ms-input.c
@@ -568,14 +568,12 @@ bool Multistate_Input_Reliability_Set(
 
     pObject = Multistate_Input_Object(object_instance);
     if (pObject) {
-        if (value <= RELIABILITY_PROPRIETARY_MAX) {
-            fault = Multistate_Input_Object_Fault(pObject);
-            pObject->Reliability = value;
-            if (fault != Multistate_Input_Object_Fault(pObject)) {
-                pObject->Change_Of_Value = true;
-            }
-            status = true;
+        fault = Multistate_Input_Object_Fault(pObject);
+        pObject->Reliability = value;
+        if (fault != Multistate_Input_Object_Fault(pObject)) {
+            pObject->Change_Of_Value = true;
         }
+        status = true;
     }
 
     return status;
diff --git a/src/bacnet/basic/object/msv.c b/src/bacnet/basic/object/msv.c
index a619b9c7..ca28649e 100644
--- a/src/bacnet/basic/object/msv.c
+++ b/src/bacnet/basic/object/msv.c
@@ -568,14 +568,12 @@ bool Multistate_Value_Reliability_Set(
 
     pObject = Multistate_Value_Object(object_instance);
     if (pObject) {
-        if (value <= RELIABILITY_PROPRIETARY_MAX) {
-            fault = Multistate_Value_Object_Fault(pObject);
-            pObject->Reliability = value;
-            if (fault != Multistate_Value_Object_Fault(pObject)) {
-                pObject->Change_Of_Value = true;
-            }
-            status = true;
+        fault = Multistate_Value_Object_Fault(pObject);
+        pObject->Reliability = value;
+        if (fault != Multistate_Value_Object_Fault(pObject)) {
+            pObject->Change_Of_Value = true;
         }
+        status = true;
     }
 
     return status;
diff --git a/src/bacnet/reject.c b/src/bacnet/reject.c
index ce6a896a..8bf84869 100644
--- a/src/bacnet/reject.c
+++ b/src/bacnet/reject.c
@@ -141,8 +141,7 @@ BACNET_ERROR_CODE reject_convert_to_error_code(BACNET_REJECT_REASON reject_code)
             error_code = ERROR_CODE_INVALID_DATA_ENCODING;
             break;
         default:
-            if ((reject_code >= REJECT_REASON_PROPRIETARY_FIRST) &&
-                (reject_code <= REJECT_REASON_PROPRIETARY_LAST)) {
+            if (reject_code >= REJECT_REASON_PROPRIETARY_FIRST) {
                 error_code = ERROR_CODE_REJECT_PROPRIETARY;
             }
             break;