diff --git a/src/bacnet/bacapp.c b/src/bacnet/bacapp.c
index 785cff23..41ff0d59 100644
--- a/src/bacnet/bacapp.c
+++ b/src/bacnet/bacapp.c
@@ -1097,6 +1097,8 @@ BACNET_APPLICATION_TAG bacapp_context_tag_type(
                 case 1:
                     tag = BACNET_APPLICATION_TAG_SIGNED_INT;
                     break;
+                default:
+                    break;
             }
             break;
         case PROP_PRESCALE:
@@ -1112,6 +1114,8 @@ BACNET_APPLICATION_TAG bacapp_context_tag_type(
                 case 1:
                     tag = BACNET_APPLICATION_TAG_UNSIGNED_INT;
                     break;
+                default:
+                    break;
             }
             break;
         default:
diff --git a/src/bacnet/basic/object/calendar.c b/src/bacnet/basic/object/calendar.c
index 69f66eb1..8379c324 100644
--- a/src/bacnet/basic/object/calendar.c
+++ b/src/bacnet/basic/object/calendar.c
@@ -710,7 +710,6 @@ void Calendar_Write_Disable(uint32_t object_instance)
  */
 uint32_t Calendar_Create(uint32_t object_instance)
 {
-    bool status = false;
     struct object_data *pObject = NULL;
     int index = 0;