diff --git a/android/bifrost.c b/android/bifrost.c
index 77af03dfae..5d3cb88a29 100644
--- a/android/bifrost.c
+++ b/android/bifrost.c
@@ -58,6 +58,8 @@ JNIEXPORT jint JNICALL JNI_OnLoad( JavaVM *vm, void *pvt)
 
    snprintf(default_paths.config_file, sizeof(default_paths.config_file), "/mnt/extsd/retroarch.cfg");
 
+   rarch_init_msg_queue();
+
    rarch_settings_set_default();
    //rarch_input_set_controls_default(input);
    rarch_config_load(default_paths.config_file, path_prefix, extension, find_libretro_file);
@@ -68,6 +70,8 @@ JNIEXPORT jint JNICALL JNI_OnLoad( JavaVM *vm, void *pvt)
    video_gl.start();
    driver.video = &video_gl;
 
+   RARCH_LOG("Reached end of JNI_OnLoad.\n" );
+
    return JNI_VERSION_1_2;
 }
 
diff --git a/android/gen/.empty b/android/gen/.empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/android/src/com/retroarch/fileio/FileChooser.java b/android/src/com/retroarch/fileio/FileChooser.java
index 442e68ecf9..6cd789cd9d 100644
--- a/android/src/com/retroarch/fileio/FileChooser.java
+++ b/android/src/com/retroarch/fileio/FileChooser.java
@@ -12,8 +12,10 @@ import com.retroarch.R.layout;
 import com.retroarch.rruntime;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.Environment;
 import android.view.KeyEvent;