diff --git a/frontend/drivers/platform_unix.c b/frontend/drivers/platform_unix.c
index 30f0dfada1..26b313aa12 100644
--- a/frontend/drivers/platform_unix.c
+++ b/frontend/drivers/platform_unix.c
@@ -577,12 +577,11 @@ static void frontend_android_get_version_sdk(int32_t *sdk)
 {
    char os_version_str[PROP_VALUE_MAX] = {0};
    system_property_get("getprop", "ro.build.version.sdk", os_version_str);
-
    *sdk = 0;
    if (os_version_str[0])
    {
-      int num_read = sscanf(os_version_str, "%d", sdk);
-      (void) num_read;
+      char *ptr = NULL;
+      sdk = (int32_t)strtol(os_version_str, &ptr, 10);
    }
 }
 
diff --git a/libretro-common/formats/cdfs/cdfs.c b/libretro-common/formats/cdfs/cdfs.c
index 4995666ebf..45438c8c37 100644
--- a/libretro-common/formats/cdfs/cdfs.c
+++ b/libretro-common/formats/cdfs/cdfs.c
@@ -458,12 +458,12 @@ static cdfs_track_t* cdfs_open_cue_track(
       }
       else if (!strncasecmp(line, "TRACK", 5))
       {
+         char *ptr             = NULL;
          unsigned track_number = 0;
-
-         const char *track = line + 5;
+         const char *track     = line + 5;
          cdfs_skip_spaces(&track);
 
-         sscanf(track, "%d", (int*)&track_number);
+         track_number = (unsigned)strtol(track, &ptr, 10);
          while (*track && *track != ' ' && *track != '\n')
             ++track;
 
@@ -479,11 +479,8 @@ static cdfs_track_t* cdfs_open_cue_track(
 
             sector_size = atoi(track + 6);
          }
-         else
-         {
-            /* assume AUDIO */
+         else /* assume AUDIO */
             sector_size = 2352;
-         }
       }
       else if (!strncasecmp(line, "INDEX", 5))
       {
@@ -635,10 +632,6 @@ cdfs_track_t* cdfs_open_raw_track(const char* path)
          }
       }
    }
-   else
-   {
-      /* unsupported file type */
-   }
 
    return track;
 }