diff --git a/gfx/drivers_shader/slang_process.cpp b/gfx/drivers_shader/slang_process.cpp
index 5dc0cca369..508955f9e4 100644
--- a/gfx/drivers_shader/slang_process.cpp
+++ b/gfx/drivers_shader/slang_process.cpp
@@ -1,4 +1,4 @@
-/*  RetroArch - A frontend for libretro.
+/*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2017 - Hans-Kristian Arntzen
  *
  *  RetroArch is free software: you can redistribute it and/or modify it under the terms
@@ -40,7 +40,7 @@ template <typename M, typename S>
 static string get_semantic_name(const unordered_map<string, M>* map,
       S semantic, unsigned index)
 {
-   for (const pair<string, M>& m : *map)
+   for (const auto& m : *map)
    {
       if (m.second.semantic == semantic && m.second.index == index)
          return m.first;
diff --git a/libretro-db/libretrodb.c b/libretro-db/libretrodb.c
index 3568ff08a1..738360bde7 100644
--- a/libretro-db/libretrodb.c
+++ b/libretro-db/libretrodb.c
@@ -228,7 +228,7 @@ int libretrodb_open(const char *path, libretrodb_t *db)
    db->path  = strdup(path);
    db->root  = filestream_tell(fd);
 
-   if ((rv = (int)filestream_read(fd, &header, sizeof(header))) == -1)
+   if ((int)filestream_read(fd, &header, sizeof(header)) == -1)
    {
       rv = -errno;
       goto error;