diff --git a/readme.md b/readme.md
index 12a32bbab..97710bccf 100644
--- a/readme.md
+++ b/readme.md
@@ -360,7 +360,7 @@ Further information (e.g. style) for ClassiCube's source code can be found in th
 * [libdragon](https://github.com/DragonMinded/libdragon) - Backend for Nintendo 64
 * [cen64](https://github.com/n64dev/cen64) - Emulator used to test Nintendo 64 port
 * [ares](https://github.com/ares-emulator/ares) - Emulator used to test Nintendo 64 port
-* [ps2sdk](https://github.com/DragonMinded/libdragon) - Backend for Nintendo 64
+* [ps2sdk](https://github.com/ps2dev/ps2sdk) - Backend for PS2
 * [PCSX2](https://github.com/ps2dev/ps2sdk) - Emulator used to test PS2 port
 
 
diff --git a/src/Graphics_GL1.c b/src/Graphics_GL1.c
index 306a3baec..c03607f25 100644
--- a/src/Graphics_GL1.c
+++ b/src/Graphics_GL1.c
@@ -8,8 +8,18 @@
  * - OpenGL 1.5 or OpenGL 1.2 + GL_ARB_vertex_buffer_object (default desktop backend)
 */
 
+#if defined CC_BUILD_WIN
+/* Avoid pointless includes */
+#define WIN32_LEAN_AND_MEAN
+#define NOSERVICE
+#define NOMCX
+#define NOIME
+#include <windows.h>
+#define GLAPI WINGDIAPI
+#else
 #define GLAPI extern
 #define APIENTRY
+#endif
 /* === BEGIN OPENGL HEADERS === */
 typedef unsigned int GLenum;
 typedef unsigned char GLboolean;
diff --git a/src/Platform_PSVita.c b/src/Platform_PSVita.c
index a204f541d..46bb15047 100644
--- a/src/Platform_PSVita.c
+++ b/src/Platform_PSVita.c
@@ -361,9 +361,9 @@ static cc_result Socket_Poll(cc_socket s, int mode, cc_bool* success) {
 	if ((res = sceNetEpollControl(epoll_id, SCE_NET_EPOLL_CTL_ADD, s, &ev))) return res;	
 	num_events = sceNetEpollWait(epoll_id, &ev, 1, 0);
 	sceNetEpollControl(epoll_id, SCE_NET_EPOLL_CTL_DEL, s, NULL);
-	
+
 	if (num_events < 0)  return num_events;
-	if (num_events == 0) return ERR_NOT_SUPPORTED; // TODO when can this ever happen?
+	if (num_events == 0) { *success = false; return 0; }
 	
 	*success = (ev.events & flags) != 0;
 	return 0;