diff --git a/engine/client/snd_alsa.c b/engine/client/snd_alsa.c
index 8cd0898b..8532df7a 100755
--- a/engine/client/snd_alsa.c
+++ b/engine/client/snd_alsa.c
@@ -131,7 +131,7 @@ static void ALSA_RW_Submit (soundcardinfo_t *sc, int start, int end)
         frames = end - sc->snd_sent;
         if (!frames)
                 return;
-	
+
 	state = psnd_pcm_state (sc->handle);
 
         ringsize = sc->sn.samples / sc->sn.numchannels;
@@ -166,8 +166,8 @@ static void ALSA_Shutdown (soundcardinfo_t *sc)
 {
 	psnd_pcm_close (sc->handle);
 
-	if (sc->Submit == ALSA_RW_Submit);
-                free(sc->sn.buffer);
+	if (sc->Submit == ALSA_RW_Submit)
+		free(sc->sn.buffer);
 }
 
 static void *ALSA_LockBuffer(soundcardinfo_t *sc)
@@ -322,7 +322,7 @@ static int ALSA_InitCard (soundcardinfo_t *sc, int cardnum)
 	}
 
 	err = psnd_pcm_hw_params_set_access (pcm, hw,  mmap?SND_PCM_ACCESS_MMAP_INTERLEAVED:SND_PCM_ACCESS_RW_INTERLEAVED);
-	if (0 > err) 
+	if (0 > err)
 	{
 		Con_Printf (CON_ERROR "ALSA: Failure to set interleaved PCM access. %s\n",
 					psnd_strerror (err));
@@ -358,7 +358,7 @@ static int ALSA_InitCard (soundcardinfo_t *sc, int cardnum)
 	// get speaker channels
 	stereo = sc->sn.numchannels;
 	err = psnd_pcm_hw_params_set_channels (pcm, hw, stereo);
-	while (err < 0) 
+	while (err < 0)
 	{
 		if (stereo > 2)
 			stereo = 2;
@@ -472,7 +472,7 @@ static int ALSA_InitCard (soundcardinfo_t *sc, int cardnum)
 		sc->GetDMAPos	= ALSA_MMap_GetDMAPos;
 		sc->Submit	= ALSA_MMap_Submit;
 		sc->GetDMAPos(sc);		// sets shm->buffer
-	
+
 		//alsa doesn't seem to like high mixahead values
 		//(maybe it tells us above somehow...)
 		//so force it lower
diff --git a/engine/client/snd_linux.c b/engine/client/snd_linux.c
index 87fa1034..055729f2 100644
--- a/engine/client/snd_linux.c
+++ b/engine/client/snd_linux.c
@@ -298,7 +298,7 @@ static int OSS_InitCard(soundcardinfo_t *sc, int cardnum)
 			if (alsadetected)
 			{
 				char *f, *n;
-				f = com_argv[0];
+				f = (char *)com_argv[0];
 				while((n = strchr(f, '/')))
 					f = n + 1;
 				Con_Printf("Your system is running alsa.\nTry: sudo echo \"%s 0 0 direct\" > /proc/asound/card0/pcm0p/oss\n", f);
diff --git a/engine/common/common.c b/engine/common/common.c
index 9a7b0daf..419dd825 100644
--- a/engine/common/common.c
+++ b/engine/common/common.c
@@ -3173,7 +3173,7 @@ void COM_Version_f (void)
 #ifdef _WIN64
 		Con_Printf("Compiled for 64bit windows\n");
 #endif
-#ifdef _M_AMD64
+#if defined(_M_AMD64) || defined(__amd64__)
 		Con_Printf("Compiled for AMD64 compatible cpus\n");
 #endif
 
diff --git a/engine/common/net_wins.c b/engine/common/net_wins.c
index e09fe902..b6123f6f 100644
--- a/engine/common/net_wins.c
+++ b/engine/common/net_wins.c
@@ -2812,7 +2812,7 @@ void NET_PrintAddresses(ftenet_connections_t *collection)
 			continue;
 		if (collection->conn[i]->GetLocalAddress)
 		{
-			for (adrno = 0, adrcount=1; adrcount = collection->conn[i]->GetLocalAddress(collection->conn[i], &adr, adrno) && adrno < adrcount; adrno++)
+			for (adrno = 0, adrcount=1; (adrcount = collection->conn[i]->GetLocalAddress(collection->conn[i], &adr, adrno)) && adrno < adrcount; adrno++)
 			{
 				Con_Printf("net address: %s\n", NET_AdrToString(adrbuf, sizeof(adrbuf), adr));
 			}
diff --git a/engine/common/plugin.c b/engine/common/plugin.c
index dcf67512..472fda56 100644
--- a/engine/common/plugin.c
+++ b/engine/common/plugin.c
@@ -265,7 +265,7 @@ int Plug_SystemCallsVM(void *offset, quintptr_t mask, int fn, const int *arg)
 	fn = fn+1;
 
 	if (fn>=0 && fn < numplugbuiltins && plugbuiltins[fn].func!=NULL)
-		#ifdef _M_AMD64
+		#if defined(_M_AMD64) || defined(_M_X64) || defined(__amd64__) || defined(_WIN64)
 			return plugbuiltins[fn].func(offset, mask, (const long long int*)args);
 		#else
 			return plugbuiltins[fn].func(offset, mask, (const long int*)args);
diff --git a/engine/common/qvm.c b/engine/common/qvm.c
index 8ceb8ac4..d3ebc9e0 100644
--- a/engine/common/qvm.c
+++ b/engine/common/qvm.c
@@ -362,7 +362,7 @@ qvm_t *QVM_LoadVM(const char *name, sys_callqvm_t syscall)
 	}
 
 // check file
-	if(header.vmMagic!=VM_MAGIC && header.vmMagic!=VM_MAGIC2 || header.instructionCount<=0 || header.codeLength<=0)
+	if( (header.vmMagic!=VM_MAGIC && header.vmMagic!=VM_MAGIC2) || header.instructionCount<=0 || header.codeLength<=0)
 	{
 		Con_Printf("%s: invalid qvm file\n", name);
 		FS_FreeFile(raw);
diff --git a/engine/server/sv_ents.c b/engine/server/sv_ents.c
index 943b9693..8fd72594 100644
--- a/engine/server/sv_ents.c
+++ b/engine/server/sv_ents.c
@@ -1103,7 +1103,7 @@ int SV_HullNumForPlayer(int h2hull, float *mins, float *maxs)
 	}
 
 	if (h2hull)
-		return h2hull-1 | (mins[2]?0:128);
+		return (h2hull-1) | (mins[2]?0:128);
 
 
 	hullnum = 0;