diff --git a/Makefile.libretro b/Makefile.libretro
index 891aa8fa..17f4699d 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -654,7 +654,7 @@ else ifneq (,$(findstring windows_msvc2017,$(platform)))
 	reg_query = $(call filter_out2,$(subst $2,,$(shell reg query "$2" -v "$1" 2>nul)))
 	fix_path = $(subst $(SPACE),\ ,$(subst \,/,$1))
 
-	ProgramFiles86w := $(shell cmd /c "echo %PROGRAMFILES(x86)%")
+	ProgramFiles86w := $(shell cmd //c "echo %PROGRAMFILES(x86)%")
 	ProgramFiles86 := $(shell cygpath "$(ProgramFiles86w)")
 
 	WindowsSdkDir ?= $(call reg_query,InstallationFolder,HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v10.0)
diff --git a/cpu/cyclone b/cpu/cyclone
index 5fc93bdd..94a9d9a8 160000
--- a/cpu/cyclone
+++ b/cpu/cyclone
@@ -1 +1 @@
-Subproject commit 5fc93bddb71461abb7619cf506d6f15ba8a675f3
+Subproject commit 94a9d9a888e72cbfa4db12113cd113cf5e154f7f
diff --git a/platform/libpicofe b/platform/libpicofe
index f8cd6a08..795b71c5 160000
--- a/platform/libpicofe
+++ b/platform/libpicofe
@@ -1 +1 @@
-Subproject commit f8cd6a082bb9c228397a0436f28818b74d8e9636
+Subproject commit 795b71c571518b310a22138141bb6d1cd08d85f6
diff --git a/platform/libretro/libretro.c b/platform/libretro/libretro.c
index af972b85..ae91156c 100644
--- a/platform/libretro/libretro.c
+++ b/platform/libretro/libretro.c
@@ -1513,7 +1513,7 @@ void retro_run(void)
    ps2->padding = padding;
 
 #else
-   buff = vout_buf + vout_offset;
+   buff = (char*)vout_buf + vout_offset;
 #endif
 
    video_cb((short *)buff,