diff --git a/CMakeLists.txt b/CMakeLists.txt
index 67ab2b0daae..3dc753f1a85 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -364,7 +364,6 @@ ADD_SUBDIRECTORY(extra/libevent)
 ADD_SUBDIRECTORY(extra)
 ADD_SUBDIRECTORY(sql)
 ADD_SUBDIRECTORY(client)
-ADD_SUBDIRECTORY(server-tools/instance-manager)
 ADD_SUBDIRECTORY(libmysql)
 ADD_SUBDIRECTORY(libservices)
 ADD_SUBDIRECTORY(tests)
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 87909c0e5a4..ddad3f4dfc9 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -679,7 +679,7 @@ public:
   Server_side_cursor *cursor;
 
   inline char *query() { return query_string.str; }
-  inline uint32 query_length() { return query_string.length; }
+  inline uint32 query_length() { return (uint32)query_string.length; }
   void set_query_inner(char *query_arg, uint32 query_length_arg);
 
   /**
diff --git a/sql/sql_string.h b/sql/sql_string.h
index 84cb3e52378..37b351624c5 100644
--- a/sql/sql_string.h
+++ b/sql/sql_string.h
@@ -376,7 +376,7 @@ public:
 
   void qs_append(const char *str)
   {
-    qs_append(str, strlen(str));
+    qs_append(str, (uint32)strlen(str));
   }
   void qs_append(const char *str, uint32 len);
   void qs_append(double d);