diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index 0622e0c74a..999ffa504e 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -1978,13 +1978,17 @@ void menu_input_get_mouse_hw_state(
 
       /* Adjust X position */
       hw_state->x                  = (int16_t)(((float)(hw_state->x - vp.x) / (float)vp.width) * (float)fb_width);
-      hw_state->x                  = (hw_state->x <  0)         ? (0          ) : hw_state->x;
-      hw_state->x                  = (hw_state->x >= fb_width)  ? (fb_width -1) : hw_state->x;
+      if (hw_state->x < 0)
+         hw_state->x               = 0;
+      else if (hw_state->x >= fb_width)
+         hw_state->x               = (fb_width -1);
 
       /* Adjust Y position */
       hw_state->y                  = (int16_t)(((float)(hw_state->y - vp.y) / (float)vp.height) * (float)fb_height);
-      hw_state->y                  = (hw_state->y <  0)         ? (0          ) : hw_state->y;
-      hw_state->y                  = (hw_state->y >= fb_height) ? (fb_height-1) : hw_state->y;
+      if (hw_state->y <  0)
+         hw_state->y               = 0;
+      else if (hw_state->y >= fb_height)
+         hw_state->y               = (fb_height-1);
    }
 
    if (state_inited)
@@ -4359,7 +4363,8 @@ void menu_driver_set_last_start_content(const char *start_content_path)
        * before the archive delimiter (i.e. path of
        * 'parent' archive file) */
       size_t len      = (size_t)(1 + archive_delim - start_content_path);
-      len             = (len < PATH_MAX_LENGTH) ? len : PATH_MAX_LENGTH;
+      if (len >= PATH_MAX_LENGTH)
+         len          = PATH_MAX_LENGTH;
 
       strlcpy(archive_path, start_content_path, len * sizeof(char));
 
@@ -4661,13 +4666,14 @@ bool menu_entries_ctl(enum menu_entries_ctl_state state, void *data)
           * Ensure it doesn't overflow.
           **/
          {
-            size_t list_size;
+            size_t list_size                = 0;
             file_list_t *list               = (file_list_t*)data;
             if (!list)
                return false;
             if (list->size)
                menu_entries_build_scroll_indices(menu_st, list);
-            list_size                       = menu_st->entries.list ? MENU_LIST_GET_SELECTION(menu_st->entries.list, 0)->size : 0;
+            if (menu_st->entries.list)
+               list_size                    = MENU_LIST_GET_SELECTION(menu_st->entries.list, 0)->size;
 
             if (list_size)
             {
diff --git a/menu/menu_screensaver.c b/menu/menu_screensaver.c
index 2376726183..f60497ff82 100644
--- a/menu/menu_screensaver.c
+++ b/menu/menu_screensaver.c
@@ -562,11 +562,15 @@ void menu_screensaver_iterate(
             particle->a = particle->a + (float)(rand() % 16 - 9) * 0.01f;
             particle->b = particle->b + (float)(rand() % 16 - 7) * 0.01f;
 
-            particle->a = (particle->a < -0.4f) ? -0.4f : particle->a;
-            particle->a = (particle->a >  0.1f) ?  0.1f : particle->a;
+            if (particle->a < -0.4f)
+               particle->a = -0.4f;
+            else if (particle->a >  0.1f)
+               particle->a = 0.1f;
 
-            particle->b = (particle->b < -0.1f) ? -0.1f : particle->b;
-            particle->b = (particle->b >  0.4f) ?  0.4f : particle->b;
+            if (particle->b < -0.1f)
+               particle->b = -0.1f;
+            else if (particle->b >  0.4f)
+               particle->b = 0.4f;
 
             /* Update particle location */
             particle->x = particle->x + (global_speed_factor * particle->size * particle->a);