diff --git a/Makefile b/Makefile
index 0f83528380..da84e7db85 100644
--- a/Makefile
+++ b/Makefile
@@ -78,6 +78,12 @@ endif
 RARCH_OBJ := $(addprefix $(OBJDIR)/,$(OBJ))
 RARCH_JOYCONFIG_OBJ := $(addprefix $(OBJDIR)/,$(JOYCONFIG_OBJ))
 
+ifneq ($(SANITIZER),)
+    CFLAGS   := -fsanitize=$(SANITIZER) $(CFLAGS)
+    CXXFLAGS := -fsanitize=$(SANITIZER) $(CXXFLAGS)
+    LDFLAGS  := -fsanitize=$(SANITIZER) $(LDLAGS)
+endif
+
 all: $(TARGET) $(JTARGET) config.mk
 
 -include $(RARCH_OBJ:.o=.d) $(RARCH_JOYCONFIG_OBJ:.o=.d)
diff --git a/gfx/drivers_font/gl_raster_font.c b/gfx/drivers_font/gl_raster_font.c
index 8693212f19..574f435cda 100644
--- a/gfx/drivers_font/gl_raster_font.c
+++ b/gfx/drivers_font/gl_raster_font.c
@@ -29,8 +29,8 @@
    font_color[      4 * (6 * i + c) + 1] = color[1]; \
    font_color[      4 * (6 * i + c) + 2] = color[2]; \
    font_color[      4 * (6 * i + c) + 3] = color[3]; \
-   font_lut_tex_coord[    4 * (6 * i + c) + 0] = gl->coords.lut_tex_coord[0]; \
-   font_lut_tex_coord[    4 * (6 * i + c) + 1] = gl->coords.lut_tex_coord[1]; \
+   font_lut_tex_coord[    2 * (6 * i + c) + 0] = gl->coords.lut_tex_coord[0]; \
+   font_lut_tex_coord[    2 * (6 * i + c) + 1] = gl->coords.lut_tex_coord[1]; \
 } while(0)
 
 #define MAX_MSG_LEN_CHUNK 64
diff --git a/retroarch.c b/retroarch.c
index 2c6177804a..c8ef98fb66 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -1117,7 +1117,7 @@ int rarch_main_init(int argc, char *argv[])
 
    if (global->verbosity)
    {
-      char str[PATH_MAX_LENGTH];
+      char str[PATH_MAX_LENGTH] = {0};
 
       RARCH_LOG_OUTPUT("=== Build =======================================");
       rarch_info_get_capabilities(RARCH_CAPABILITIES_CPU, str, sizeof(str));
diff --git a/runloop.c b/runloop.c
index 8fc6c845ef..6637e2440b 100644
--- a/runloop.c
+++ b/runloop.c
@@ -948,19 +948,16 @@ void rarch_main_state_free(void)
 
 void rarch_main_global_free(void)
 {
-   global_t *global = NULL;
-   
    event_command(EVENT_CMD_TEMPORARY_CONTENT_DEINIT);
    event_command(EVENT_CMD_SUBSYSTEM_FULLPATHS_DEINIT);
    event_command(EVENT_CMD_RECORD_DEINIT);
    event_command(EVENT_CMD_LOG_FILE_DEINIT);
 
-   global = global_get_ptr();
-
-   if (!global)
+   if (!g_extern)
       return;
 
-   free(global);
+   free(g_extern);
+   g_extern = NULL;
 }
 
 bool rarch_main_verbosity(void)