diff --git a/apple/common/RAGameView.m b/apple/common/RAGameView.m
index e5cd8eb82d..6b24f09cb3 100644
--- a/apple/common/RAGameView.m
+++ b/apple/common/RAGameView.m
@@ -56,7 +56,7 @@
 @implementation NSScreen (IOSCompat)
 - (CGRect)bounds
 {
-	CGRect cgrect  = (CGRect)NSRectToCGRect(self.frame);
+	CGRect cgrect  = NSRectToCGRect(self.frame);
 	return CGRectMake(0, 0, CGRectGetWidth(cgrect), CGRectGetHeight(cgrect));
 }
 - (float) scale  { return 1.0f; }
diff --git a/apple/common/apple_gfx_context.c.inl b/apple/common/apple_gfx_context.c.inl
index 18105feb6d..4fb3b67243 100644
--- a/apple/common/apple_gfx_context.c.inl
+++ b/apple/common/apple_gfx_context.c.inl
@@ -135,7 +135,7 @@ static void apple_gfx_ctx_get_video_size(void *data, unsigned* width, unsigned*
    if (gl)
    {
 #if defined(OSX)
-      CGRect cgrect = (CGRect)NSRectToCGRect([g_view frame]);
+      CGRect cgrect = NSRectToCGRect([g_view frame]);
       size = CGRectMake(0, 0, CGRectGetWidth(cgrect), CGRectGetHeight(cgrect));
 #else
       size = g_view.bounds;
diff --git a/frontend/menu/disp/lakka.c b/frontend/menu/disp/lakka.c
index 0fc0086df3..daecb2908f 100644
--- a/frontend/menu/disp/lakka.c
+++ b/frontend/menu/disp/lakka.c
@@ -1045,8 +1045,17 @@ static void lakka_init_core_info(void *data)
 {
    (void)data;
 
-   if (g_extern.core_info)
+   core_info_list_free(g_extern.core_info);
+   g_extern.core_info = NULL;
+   if (*g_settings.libretro_directory) {
+      g_extern.core_info = core_info_list_new(g_settings.libretro_directory);
+   }
+
+   if (g_extern.core_info) {
       num_categories = g_extern.core_info->count + 1;
+   } else {
+     num_categories = 1;
+   }
 }
 
 static void *lakka_init(void)
diff --git a/location/nulllocation.c b/location/nulllocation.c
index 36809a7450..715b3f59d8 100644
--- a/location/nulllocation.c
+++ b/location/nulllocation.c
@@ -16,10 +16,6 @@
 
 #include "../driver.h"
 
-typedef struct null_location
-{
-} nulllocation_t;
-
 static void *null_location_init(void)
 {
    return NULL;