diff --git a/android/app-android.cpp b/android/app-android.cpp
index 8d9792dc90..58a7468311 100644
--- a/android/app-android.cpp
+++ b/android/app-android.cpp
@@ -126,7 +126,7 @@ extern "C" void Java_com_turboviking_libnative_NativeApp_init
   VFSRegister("", new ZipAssetReader(apkPath.c_str(), "assets/"));
 
   std::string externalDir = GetJavaString(env, jexternalDir);
-  std::string user_data_path = GetJavaString(env, jdataDir); + "/";
+  std::string user_data_path = GetJavaString(env, jdataDir) + "/";
   std::string library_path = GetJavaString(env, jlibraryDir) + "/";
   std::string installID = GetJavaString(env, jinstallID);
 
diff --git a/base/stringutil.cpp b/base/stringutil.cpp
index 229a8a7e89..657f3000a5 100644
--- a/base/stringutil.cpp
+++ b/base/stringutil.cpp
@@ -5,11 +5,11 @@
 
 unsigned int parseHex(const char *_szValue)
 {
-	int Count, Value = 0;
+	int Value = 0;
 	size_t Finish = strlen(_szValue);
 	if (Finish > 8 ) { Finish = 8; }
 
-	for (Count = 0; Count < Finish; Count++) {
+	for (size_t Count = 0; Count < Finish; Count++) {
 		Value = (Value << 4);
 		switch( _szValue[Count] ) {
 		case '0': break;
diff --git a/gfx_es2/glsl_program.cpp b/gfx_es2/glsl_program.cpp
index 74b6f108d1..ea94ca8acc 100644
--- a/gfx_es2/glsl_program.cpp
+++ b/gfx_es2/glsl_program.cpp
@@ -65,7 +65,7 @@ bool glsl_up_to_date(GLSLProgram *program) {
   stat(program->vshader_filename, &vs);
   stat(program->fshader_filename, &fs);
   if (vs.st_mtime != program->vshader_mtime ||
-    fs.st_mtime != program->fshader_mtime) {
+      fs.st_mtime != program->fshader_mtime) {
       return false;
   } else {
     return true;
diff --git a/midi/midi_input.cpp b/midi/midi_input.cpp
index 143ac12013..d42ccff13d 100644
--- a/midi/midi_input.cpp
+++ b/midi/midi_input.cpp
@@ -78,6 +78,7 @@ std::vector<std::string> MidiInGetDevices() {
 
 MidiDevice MidiInStart(int deviceID, MidiListener *listener) {
   FLOG("Invalid MIDI device");
+  return 0;
 }
 
 void MidiInStop(MidiDevice device) {
diff --git a/net/http_client.cpp b/net/http_client.cpp
index 8e982d5824..90217e7be7 100644
--- a/net/http_client.cpp
+++ b/net/http_client.cpp
@@ -1,6 +1,7 @@
 #include "net/http_client.h"
 
 // for inet_pton
+#undef _WIN32_WINNT
 #define _WIN32_WINNT 0x600
 
 #ifndef _WIN32
@@ -34,7 +35,7 @@ Connection::~Connection() {
 }
 
 bool Connection::Resolve(const char *host, int port) {
-  CHECK_EQ(-1, sock_);
+  CHECK_EQ(-1, (intptr_t)sock_);
   host_ = host;
   port_ = port;
 
@@ -68,7 +69,7 @@ void Connection::Connect() {
 }
 
 void Connection::Disconnect() {
-  if (sock_ != -1) {
+  if ((intptr_t)sock_ != -1) {
     closesocket(sock_);
     sock_ = -1;
   } else {