diff --git a/Makefile.griffin b/Makefile.griffin
index 34c05785e3..e2c7616d12 100644
--- a/Makefile.griffin
+++ b/Makefile.griffin
@@ -125,7 +125,7 @@ ifeq ($(HAVE_LOGGER), 1)
 endif
 endif
 
-  CFLAGS += -DGEKKO
+  CFLAGS += -DGEKKO -U__INT32_TYPE__ -U __UINT32_TYPE__ -D__INT32_TYPE__=int
 
   HAVE_FILTERS_BUILTIN     := 1
   HAVE_THREADS             := 1
diff --git a/frontend/drivers/platform_gx.c b/frontend/drivers/platform_gx.c
index 6e0c7ce862..57916af632 100644
--- a/frontend/drivers/platform_gx.c
+++ b/frontend/drivers/platform_gx.c
@@ -207,7 +207,7 @@ static void frontend_gx_get_environment_settings(
 #ifdef HW_DOL
    chdir("carda:/retroarch");
 #endif
-   getcwd(g_defaults.dir.core, MAXPATHLEN);
+   getcwd(g_defaults.dir.core, PATH_MAX_LENGTH);
 
    last_slash = strrchr(g_defaults.dir.core, '/');
    if (last_slash)