diff --git a/fpga_io.cpp b/fpga_io.cpp
index 2092eda..b2c094a 100644
--- a/fpga_io.cpp
+++ b/fpga_io.cpp
@@ -462,7 +462,9 @@ int fpga_load_rbf(const char *name, const char *cfg)
 	}
 
 	printf("Loading RBF: %s\n", name);
-	sprintf(path, "%s/%s", !strcasecmp(name, "menu.rbf") ? getStorageDir(0) : getRootDir(), name);
+
+	if(name[0] == '/') strcpy(path, name);
+	else sprintf(path, "%s/%s", !strcasecmp(name, "menu.rbf") ? getStorageDir(0) : getRootDir(), name);
 
 	int rbf = open(path, O_RDONLY);
 	if (rbf < 0)
diff --git a/input.cpp b/input.cpp
index a05f0d4..64e91e0 100644
--- a/input.cpp
+++ b/input.cpp
@@ -2201,7 +2201,7 @@ static void input_cb(struct input_event *ev, struct input_absinfo *absinfo, int
 				if (code == 111) reset_m |= 0x100;
 				user_io_check_reset(reset_m, (keyrah && !cfg.reset_combo) ? 1 : cfg.reset_combo);
 
-				if(!user_io_osd_is_visible() && ((user_io_get_kbdemu() == EMU_JOY0) || (user_io_get_kbdemu() == EMU_JOY1)))
+				if(!user_io_osd_is_visible() && ((user_io_get_kbdemu() == EMU_JOY0) || (user_io_get_kbdemu() == EMU_JOY1)) && !video_fb_state())
 				{
 					if (!kbd_toggle)
 					{
@@ -2978,9 +2978,11 @@ int input_test(int getchar)
 				int len = read(pool[NUMDEV + 1].fd, cmd, sizeof(cmd) - 1);
 				if (len)
 				{
+					if (cmd[len - 1] == '\n') cmd[len - 1] = 0;
 					cmd[len] = 0;
 					printf("MiSTer_cmd: %s\n", cmd);
 					if (!strncmp(cmd, "fb_cmd", 6)) video_cmd(cmd);
+					else if (!strncmp(cmd, "load_core ", 10)) fpga_load_rbf(cmd + 10);
 				}
 			}
 		}