diff --git a/watch-faces/clock/solar_time_face.c b/watch-faces/clock/solar_time_face.c
index 54592975..f6a0ab6e 100644
--- a/watch-faces/clock/solar_time_face.c
+++ b/watch-faces/clock/solar_time_face.c
@@ -102,7 +102,7 @@ static int32_t _lst_seconds(watch_date_time_t dt, float TC) {
 }
 
 static void _update_display(solar_time_state_t *state, watch_date_time_t dt) {
-    char bottom[7];
+    char bottom[9];
 
     if (_load_location().reg == 0) {
         watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, "SOL", "SO");
diff --git a/watch-faces/complication/tide_face.c b/watch-faces/complication/tide_face.c
index e3cd9577..7f6b1c7c 100644
--- a/watch-faces/complication/tide_face.c
+++ b/watch-faces/complication/tide_face.c
@@ -81,6 +81,7 @@ typedef struct {
 } tide_state_t;
 
 void tide_face_setup(uint8_t watch_face_index, void** state_ptr) {
+    (void) watch_face_index;
     if (*state_ptr == NULL) {
         // Boot time initialization.
         *state_ptr = malloc(sizeof(tide_state_t));
@@ -89,11 +90,11 @@ void tide_face_setup(uint8_t watch_face_index, void** state_ptr) {
     }
 }
 
-uint32_t _get_current_unix_time() {
+static uint32_t _get_current_unix_time() {
     return watch_utility_date_time_to_unix_time(movement_get_utc_date_time(), 0);
 }
 
-void _move_next_high_tide(tide_state_t* state, uint32_t now) {
+static void _move_next_high_tide(tide_state_t* state, uint32_t now) {
     while (state->next_high_tide > now + SEMI_DIURNAL_TIDAL_PERIOD) {
         state->next_high_tide -= SEMI_DIURNAL_TIDAL_PERIOD;
     }
@@ -129,8 +130,10 @@ static void _draw_tide_amplitude(uint32_t time) {
     switch (_get_tide_amplitude(time)) {
         case spring_tide:
             _set_pixel(digit_mapping[9].segment[0]);  // top horizontal bar on the bottom-right character.
+            // fall-through
         case medium_tide:
             _set_pixel(digit_mapping[9].segment[6]);  // mid horizontal bar on the bottom-right character.
+            // fall-through
         case neap_tide:
             _set_pixel(digit_mapping[9].segment[3]);  // bottom horizontal bar on the bottom-right character.
             break;
@@ -341,7 +344,7 @@ bool tide_face_loop(movement_event_t event, void* context) {
             switch(state->mode) {
                 case empty:
                   state->next_high_tide = _get_current_unix_time();
-                  // fallthrough intended.
+                  // fall-through
                 case current:
                 case future:
                     state->mode = setting_hour;
@@ -382,7 +385,7 @@ bool tide_face_loop(movement_event_t event, void* context) {
                 state->mode = current;
                 _draw(state, now, event.subsecond);
             }
-            // Passthrough intended:
+            // fall-through
             // Delegate the resign behavior to the default loop handler.
         default:
             return movement_default_loop_handler(event);
diff --git a/watch-faces/complication/totp_face.c b/watch-faces/complication/totp_face.c
index f405da8e..a40960a6 100644
--- a/watch-faces/complication/totp_face.c
+++ b/watch-faces/complication/totp_face.c
@@ -149,7 +149,7 @@ static void totp_display_code(totp_state_t *totp_state) {
     sprintf(buf, "%2d", valid_for);
     watch_display_text(WATCH_POSITION_TOP_RIGHT, buf);
 
-    sprintf(buf, "%06u", totp_state->current_code);
+    sprintf(buf, "%06u", (unsigned int)totp_state->current_code);
     watch_display_text(WATCH_POSITION_BOTTOM, buf);
 }
 
diff --git a/watch-faces/sensor/voltage_face.c b/watch-faces/sensor/voltage_face.c
index 320f30f9..eba74e2d 100644
--- a/watch-faces/sensor/voltage_face.c
+++ b/watch-faces/sensor/voltage_face.c
@@ -45,7 +45,7 @@ void voltage_face_activate(void *context) {
 
 bool voltage_face_loop(movement_event_t event, void *context) {
     (void) context;
-    watch_date_time_t date_time;
+    watch_date_time_t date_time = {0};
     switch (event.event_type) {
         case EVENT_ACTIVATE:
             if (watch_sleep_animation_is_running()) watch_stop_sleep_animation();