diff --git a/include/JSystem/JGadget/define.h b/include/JSystem/JGadget/define.h
index a8c7323e8f..3a1548e364 100644
--- a/include/JSystem/JGadget/define.h
+++ b/include/JSystem/JGadget/define.h
@@ -15,9 +15,11 @@ public:
     JGadget_outMessage(MessageFunc fn, const char* file, int line);
     ~JGadget_outMessage();
 
+#if !TARGET_PC
     JGadget_outMessage& operator<<(int param_1) { return *this << (s32)param_1; }
-    JGadget_outMessage& operator<<(u16);
     JGadget_outMessage& operator<<(uint);
+#endif
+    JGadget_outMessage& operator<<(u16);
     JGadget_outMessage& operator<<(u8 param_1) { return *this << (char)param_1; }
     JGadget_outMessage& operator<<(const char* str);
     JGadget_outMessage& operator<<(char);
diff --git a/include/revolution/types.h b/include/revolution/types.h
index 2434b54085..355768087e 100644
--- a/include/revolution/types.h
+++ b/include/revolution/types.h
@@ -5,8 +5,13 @@ typedef signed   char          s8;
 typedef unsigned char          u8;
 typedef signed   short int     s16;
 typedef unsigned short int     u16;
+#if TARGET_PC
+typedef signed   int           s32;
+typedef unsigned int           u32;
+#else
 typedef signed   long          s32;
 typedef unsigned long          u32;
+#endif
 typedef signed   long long int s64;
 typedef unsigned long long int u64;
 
diff --git a/src/dusk/jsystem_stubs.cpp b/src/dusk/jsystem_stubs.cpp
index 1ca727fe00..3a1b18fbab 100644
--- a/src/dusk/jsystem_stubs.cpp
+++ b/src/dusk/jsystem_stubs.cpp
@@ -140,6 +140,6 @@ int JOREventCallbackListNode::JORAct(u32 eventID, const char* eventName) {
 }
 */
 #pragma mark J3DPSMtxArrayConcat
-void J3DPSMtxArrayConcat(float (*a)[4], float (*b)[4], float (*out)[4], unsigned long count) {
+void J3DPSMtxArrayConcat(float (*a)[4], float (*b)[4], float (*out)[4], u32 count) {
     puts("J3DPSMtxArrayConcat is a stub");
 }