diff --git a/gfx/drivers/gl3.c b/gfx/drivers/gl3.c
index 73ff2f0a75..b70d6cbc76 100644
--- a/gfx/drivers/gl3.c
+++ b/gfx/drivers/gl3.c
@@ -1377,7 +1377,7 @@ static unsigned gl3_num_miplevels(unsigned width, unsigned height)
 static void video_texture_load_gl3(
       const struct texture_image *ti,
       enum texture_filter_type filter_type,
-      uintptr_t *idptr)
+      GLuint *idptr)
 {
    /* Generate the OpenGL texture object */
    GLuint id;
@@ -1439,7 +1439,7 @@ static bool gl3_overlay_load(void *data,
       const void *image_data, unsigned num_images)
 {
    unsigned i, j;
-   uintptr_t id;
+   GLuint id;
    gl3_t *gl = (gl3_t*)data;
    const struct texture_image *images =
       (const struct texture_image*)image_data;
@@ -2094,7 +2094,7 @@ static struct video_shader *gl3_get_current_shader(void *data)
 #ifdef HAVE_THREADS
 static int video_texture_load_wrap_gl3_mipmap(void *data)
 {
-   uintptr_t id = 0;
+   GLuint id = 0;
 
    if (!data)
       return 0;
@@ -2105,7 +2105,7 @@ static int video_texture_load_wrap_gl3_mipmap(void *data)
 
 static int video_texture_load_wrap_gl3(void *data)
 {
-   uintptr_t id = 0;
+   GLuint id = 0;
 
    if (!data)
       return 0;
@@ -2118,7 +2118,7 @@ static int video_texture_load_wrap_gl3(void *data)
 static uintptr_t gl3_load_texture(void *video_data, void *data,
       bool threaded, enum texture_filter_type filter_type)
 {
-   uintptr_t id = 0;
+   GLuint id = 0;
 
 #ifdef HAVE_THREADS
    if (threaded)
diff --git a/gfx/drivers_shader/shader_gl3.cpp b/gfx/drivers_shader/shader_gl3.cpp
index 06ace051dc..ae42f4415b 100644
--- a/gfx/drivers_shader/shader_gl3.cpp
+++ b/gfx/drivers_shader/shader_gl3.cpp
@@ -674,7 +674,7 @@ public:
 
 UBORing::~UBORing()
 {
-   glDeleteBuffers(buffers.size(), buffers.data());
+   glDeleteBuffers((GLsizei)buffers.size(), buffers.data());
 }
 
 class Pass
diff --git a/libretro-common/formats/cdfs/cdfs.c b/libretro-common/formats/cdfs/cdfs.c
index 45438c8c37..9bc79f8e76 100644
--- a/libretro-common/formats/cdfs/cdfs.c
+++ b/libretro-common/formats/cdfs/cdfs.c
@@ -119,7 +119,7 @@ uint32_t cdfs_get_num_sectors(cdfs_file_t* file)
       if (frame_size == 0)
          frame_size = 1; /* prevent divide by 0 error if sector size is unknown */
    }
-   return intfstream_get_size(file->track->stream) / frame_size;
+   return (uint32_t)(intfstream_get_size(file->track->stream) / frame_size);
 }
 
 uint32_t cdfs_get_first_sector(cdfs_file_t* file)
@@ -287,7 +287,7 @@ int64_t cdfs_read_file(cdfs_file_t* file, void* buffer, uint64_t len)
       cdfs_seek_track_sector(file->track, file->current_sector);
       intfstream_read(file->track->stream, file->sector_buffer, 2048);
       memcpy(buffer, file->sector_buffer, (size_t)len);
-      file->current_sector_offset = len;
+      file->current_sector_offset = (unsigned int)len;
       file->sector_buffer_valid   = 1;
 
       bytes_read += len;
diff --git a/ui/drivers/ui_cocoa.m b/ui/drivers/ui_cocoa.m
index 01269fee1f..517b92673e 100644
--- a/ui/drivers/ui_cocoa.m
+++ b/ui/drivers/ui_cocoa.m
@@ -851,7 +851,7 @@ static void open_document_handler(
    if (browser)
    {
       ui_browser_window_state_t
-         browser_state                  = {{0}};
+         browser_state                  = {NULL};
       bool result                       = false;
       settings_t *settings              = config_get_ptr();
       const char *path_dir_menu_content = settings->paths.directory_menu_content;