diff --git a/polymer/build/include/polymer.h b/polymer/build/include/polymer.h
index 9b23f1bcd..3f6dadc85 100644
--- a/polymer/build/include/polymer.h
+++ b/polymer/build/include/polymer.h
@@ -6,7 +6,7 @@
 # ifdef _WIN32
 #  define PR_CALLBACK __stdcall
 # else
-#  defube PR_CALLBACK
+#  define PR_CALLBACK
 # endif
 
 # include "compat.h"
diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index d5c3b0f2a..c7547ebda 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -9876,8 +9876,6 @@ void fakedomovethings(void)
 
     syn = (input *)&inputfifo[fakemovefifoplc&(MOVEFIFOSIZ-1)][myconnectindex];
 
-    OnEvent(EVENT_FAKEDOMOVETHINGS, ps[myconnectindex].i, myconnectindex, -1);
-
     p = &ps[myconnectindex];
 
     backcstat = sprite[p->i].cstat;
@@ -10292,9 +10290,10 @@ FAKEHORIZONLY:
         myreturntocenter = 9;
     }
 
-
 ENDFAKEPROCESSINPUT:
 
+    OnEvent(EVENT_FAKEDOMOVETHINGS, ps[myconnectindex].i, myconnectindex, -1);
+
     myxbak[fakemovefifoplc&(MOVEFIFOSIZ-1)] = myx;
     myybak[fakemovefifoplc&(MOVEFIFOSIZ-1)] = myy;
     myzbak[fakemovefifoplc&(MOVEFIFOSIZ-1)] = myz;
diff --git a/polymer/eduke32/source/gamedef.c b/polymer/eduke32/source/gamedef.c
index f7b05af18..e4985cd0d 100644
--- a/polymer/eduke32/source/gamedef.c
+++ b/polymer/eduke32/source/gamedef.c
@@ -31,13 +31,13 @@ static char compilefile[BMAX_PATH] = "(none)";  // file we're currently compilin
 static char parsing_item_name[MAXVARLABEL] = "(none)", previous_item_name[MAXVARLABEL] = "NULL";
 
 static short total_lines,line_number;
-static char checking_ifelse,parsing_state;
+static short checking_ifelse,parsing_state;
 char g_szBuf[1024];
 
 long *casescriptptr=NULL;      // the pointer to the start of the case table in a switch statement
 // first entry is 'default' code.
 int casecount = 0;
-signed char checking_switch = 0, current_event = -1;
+signed short checking_switch = 0, current_event = -1;
 char labelsonly = 0, nokeywordcheck = 0, dynamicremap = 0;
 static short num_braces = 0;    // init to some sensible defaults