diff --git a/frontend/drivers/platform_vita.c b/frontend/drivers/platform_vita.c
index 064a9d3437..7aeeab94e0 100644
--- a/frontend/drivers/platform_vita.c
+++ b/frontend/drivers/platform_vita.c
@@ -56,7 +56,7 @@ static void frontend_vita_get_environment_settings(int *argc, char *argv[],
 
    strlcpy(retroarch_path, "cache0:/retroarch/", sizeof(retroarch_path));
 
-   fill_pathname_basedir(g_defaults.dir.port, retroarch_path, sizeof(g_defaults.dir.port));
+   strlcpy(g_defaults.dir.port, retroarch_path, sizeof(g_defaults.dir.port));
    RARCH_LOG("port dir: [%s]\n", g_defaults.dir.port);
 
    fill_pathname_join(g_defaults.dir.assets, g_defaults.dir.port,
diff --git a/gfx/drivers/vita2d_gfx.c b/gfx/drivers/vita2d_gfx.c
index c6f358a254..1818fb1410 100644
--- a/gfx/drivers/vita2d_gfx.c
+++ b/gfx/drivers/vita2d_gfx.c
@@ -67,7 +67,10 @@ static void *vita2d_gfx_init(const video_info_t *video,
    if (!vita)
       return NULL;
 
-    RARCH_LOG("vita2d_gfx_init: w: %i  h: %i\n", video->width, video->height);
+   RARCH_LOG("vita2d_gfx_init: w: %i  h: %i\n", video->width, video->height);
+   RARCH_LOG("RARCH_SCALE_BASE: %i input_scale: %i = %i\n",
+	RARCH_SCALE_BASE, video->input_scale, RARCH_SCALE_BASE * video->input_scale);
+
 
    vita2d_init();
    vita2d_set_clear_color(RGBA8(0x40, 0x40, 0x40, 0xFF));
@@ -150,7 +153,7 @@ static bool vita2d_gfx_frame(void *data, const void *frame,
    vita2d_start_drawing();
    vita2d_clear_screen();
 
-   if (frame && vita->texture)
+   if (vita->texture)
    {
       if (vita->fullscreen)
          vita2d_draw_texture_scale(vita->texture,
@@ -248,11 +251,19 @@ static void vita2d_gfx_free(void *data)
 {
    vita_video_t *vita = (vita_video_t *)data;
 
+   RARCH_LOG("vita2d_gfx_free()\n");
+
    if (vita->menu.frame)
+   {
       vita2d_free_texture(vita->menu.frame);
+      vita->menu.frame = NULL;
+   }
 
    if (vita->texture)
+   {
       vita2d_free_texture(vita->texture);
+      vita->texture = NULL;
+   }
 
    vita2d_fini();
 }