diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 98b6f7e98..edb59eefe 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -7003,9 +7003,9 @@ const char * linphone_core_get_video_preset(const LinphoneCore *lc) {
 static int linphone_core_call_void_method(jobject obj, jmethodID id) {
 	JNIEnv *env=ms_get_jni_env();
 	if (env && obj) {
-		(*env)->CallVoidMethod(env,obj,id);
-		if ((*env)->ExceptionCheck(env)) {
-			(*env)->ExceptionClear(env);
+		env->CallVoidMethod(obj,id);
+		if (env->ExceptionCheck()) {
+			env->ExceptionClear();
 			return -1;
 		} else
 			return 0;
diff --git a/coreapi/message_storage.c b/coreapi/message_storage.c
index b064b268e..9067afdd7 100644
--- a/coreapi/message_storage.c
+++ b/coreapi/message_storage.c
@@ -23,9 +23,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifdef SQLITE_STORAGE_ENABLED
 
-#ifndef PRIu64
-#define PRIu64 "I64u"
-#endif
 
 #ifndef _WIN32
 #if !defined(__QNXNTO__) && !defined(__ANDROID__)
@@ -883,7 +880,7 @@ void linphone_message_storage_init_chat_rooms(LinphoneCore *lc) {
 }
 
 static void _linphone_message_storage_profile(void*data,const char*statement, sqlite3_uint64 duration){
-	ms_warning("SQL statement '%s' took %" PRIu64 " microseconds", statement, (uint64_t)(duration / 1000LL) );
+	ms_warning("SQL statement '%s' took %llu microseconds", statement, (unsigned long long)(duration / 1000LL) );
 }
 
 static void linphone_message_storage_activate_debug(sqlite3* db, bool_t debug){
diff --git a/coreapi/private.h b/coreapi/private.h
index bc2175efb..33d8b9710 100644
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -47,6 +47,7 @@
 
 #include <ctype.h>
 
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif