diff --git a/source/src/clients2c.cpp b/source/src/clients2c.cpp
index dcfd5106..f90efd79 100644
--- a/source/src/clients2c.cpp
+++ b/source/src/clients2c.cpp
@@ -586,9 +586,9 @@ void parsemessages(int cn, playerent *d, ucharbuf &p)
                         break;
                     case CTFF_DROPPED:
                     {
-                        short x = getuint(p)/DMF;
-                        short y = getuint(p)/DMF;
-                        short z = getuint(p)/DMF;
+                        float x = getuint(p)/DMF;
+                        float y = getuint(p)/DMF;
+                        float z = getuint(p)/DMF;
                         flagdropped(flag, x, y, z);
                         break;
                     }
diff --git a/source/src/entities.cpp b/source/src/entities.cpp
index 99cd480b..166091a8 100644
--- a/source/src/entities.cpp
+++ b/source/src/entities.cpp
@@ -248,7 +248,7 @@ void checkitems(playerent *d)
         flaginfo &f = flaginfos[i];
         entity &e = *f.flagent;
         if(!e.spawned || !f.ack || (f.state == CTFF_INBASE && !numflagspawn[i])) continue;
-        if(OUTBORD(int(f.pos.x), int(f.pos.y))) continue;
+        if(OUTBORD(f.pos.x, f.pos.y)) continue;
         if(f.state==CTFF_DROPPED) // 3d collision for dropped ctf flags
         {
             if(objcollide(d, f.pos, 2.5f, 4.0f)) trypickupflag(i, d);
@@ -371,7 +371,7 @@ void flagstolen(int flag, int act)
 	f.ack = true;
 }
 
-void flagdropped(int flag, short x, short y, short z)
+void flagdropped(int flag, float x, float y, float z)
 {
 	flaginfo &f = flaginfos[flag];
     if(OUTBORD(x, y)) return; // valid pos
diff --git a/source/src/protos.h b/source/src/protos.h
index 886307dc..f619e2af 100644
--- a/source/src/protos.h
+++ b/source/src/protos.h
@@ -339,7 +339,7 @@ extern void tryflagdrop(bool manual = false);
 extern void flagreturn(int fln);
 extern void flagscore(int fln);
 extern void flagstolen(int flag, int act);
-extern void flagdropped(int flag, short x, short y, short z);
+extern void flagdropped(int flag, float x, float y, float z);
 extern void flaginbase(int flag);
 extern void flagidle(int flag);
 extern void flagmsg(int flag, int message, int actor, int flagtime);
diff --git a/source/src/winserviceinstaller.h b/source/src/winserviceinstaller.h
index 6c337feb..372f8743 100644
--- a/source/src/winserviceinstaller.h
+++ b/source/src/winserviceinstaller.h
@@ -50,4 +50,5 @@ public:
             return 1;
         }
     }
-};
\ No newline at end of file
+};
+
diff --git a/source/src/wizard.cpp b/source/src/wizard.cpp
index 699851d5..fa79c59c 100644
--- a/source/src/wizard.cpp
+++ b/source/src/wizard.cpp
@@ -11,7 +11,9 @@
 using namespace std;
 
 #ifdef WIN32
-    #pragma warning( disable : 4996 )
+    #ifndef __GNUC__
+        #pragma warning( disable : 4996 )
+    #endif
     #include <direct.h>
     #include "winserviceinstaller.h"
 #elif __GNUC__