diff --git a/Makefile.griffin b/Makefile.griffin
index b258af4600..dd30f90ec0 100644
--- a/Makefile.griffin
+++ b/Makefile.griffin
@@ -402,7 +402,9 @@ all: $(EXT_TARGET)
 	$(ELF2DOL) $< $@
 
 %.velf: %.elf
+ifneq ($(DEBUG), 1)
 	arm-vita-eabi-strip -g $<
+endif
 	vita-elf-create $< $@
 	vita-make-fself $@ eboot.bin
 
diff --git a/defines/psp_defines.h b/defines/psp_defines.h
index 2e912ba9d4..faacb9c49c 100644
--- a/defines/psp_defines.h
+++ b/defines/psp_defines.h
@@ -32,6 +32,7 @@
 #if defined(SN_TARGET_PSP2) || defined(VITA)
 
 #ifdef VITA
+#define printf sceClibPrintf
 #define PSP_DISPLAY_PIXEL_FORMAT_8888 (SCE_DISPLAY_PIXELFORMAT_A8B8G8R8)
 #else
 #define PSP_DISPLAY_PIXEL_FORMAT_8888 (SCE_DISPLAY_PIXELFORMAT_A8B8G8R8)
diff --git a/libretro-common/formats/png/rpng_encode.c b/libretro-common/formats/png/rpng_encode.c
index 337809af2f..7f5b8e2d03 100644
--- a/libretro-common/formats/png/rpng_encode.c
+++ b/libretro-common/formats/png/rpng_encode.c
@@ -31,7 +31,7 @@
 
 #undef GOTO_END_ERROR
 #define GOTO_END_ERROR() do { \
-   fprintf(stderr, "[RPNG]: Error in line %d.\n", __LINE__); \
+   sceClibPrintf("[RPNG]: Error in line %d.\n", __LINE__); \
    ret = false; \
    goto end; \
 } while(0)
@@ -365,8 +365,10 @@ end:
    free(avg_filtered);
    free(paeth_filtered);
 
+#if !defined(VITA)
    if (stream_backend)
       stream_backend->stream_free(stream);
+#endif
    return ret;
 }
 
diff --git a/menu/drivers_display/menu_display_vita2d.c b/menu/drivers_display/menu_display_vita2d.c
index 91a89fcc4b..9136ba9d9c 100644
--- a/menu/drivers_display/menu_display_vita2d.c
+++ b/menu/drivers_display/menu_display_vita2d.c
@@ -41,13 +41,13 @@ static const float vita2d_tex_coords[] = {
 
 static const float *menu_display_vita2d_get_default_vertices(void)
 {
-   RARCH_LOG("DEFAULT VERTICES\n");
+   //RARCH_LOG("DEFAULT VERTICES\n");
    return &vita2d_vertexes[0];
 }
 
 static const float *menu_display_vita2d_get_default_tex_coords(void)
 {
-   RARCH_LOG("DEFAULT TEX\n");
+   //RARCH_LOG("DEFAULT TEX\n");
    return &vita2d_tex_coords[0];
 }
 
diff --git a/tasks/task_screenshot.c b/tasks/task_screenshot.c
index 525fbeaeb5..7c15c1db1d 100644
--- a/tasks/task_screenshot.c
+++ b/tasks/task_screenshot.c
@@ -231,7 +231,11 @@ static bool take_screenshot_choice(const char *global_name_base)
       /* Avoid taking screenshot of GUI overlays. */
       video_driver_set_texture_enable(false, false);
       video_driver_cached_frame_render();
+#if defined(VITA)
+      return take_screenshot_raw(global_name_base);
+#else
       return take_screenshot_viewport(global_name_base);
+#endif
    }
 
    if (!video_driver_cached_frame_has_valid_framebuffer())