diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cdb539969..aeb45a7bd 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -381,9 +381,6 @@ foreach (header ${LINPHONE_CXX_OBJECTS_PRIVATE_HEADER_FILES})
 endforeach ()
 set(LINPHONE_PRIVATE_HEADER_FILES ${LINPHONE_PRIVATE_HEADER_FILES} PARENT_SCOPE)
 
-if (ANDROID AND CMAKE_C_COMPILER_ID STREQUAL "GNU") 
-	list(APPEND STRICT_OPTIONS_CXX "-Wno-attributes")
-endif()
 bc_apply_compile_flags(LINPHONE_CXX_OBJECTS_SOURCE_FILES STRICT_OPTIONS_CPP STRICT_OPTIONS_CXX)
 bc_apply_compile_flags(LINPHONE_OBJC_SOURCE_FILES STRICT_OPTIONS_CPP STRICT_OPTIONS_OBJC)
 
diff --git a/tester/CMakeLists.txt b/tester/CMakeLists.txt
index e15409ddf..9a4e257a7 100644
--- a/tester/CMakeLists.txt
+++ b/tester/CMakeLists.txt
@@ -230,7 +230,7 @@ endif()
 
 # TODO: Remove me later!
 list(REMOVE_ITEM STRICT_OPTIONS_CPP "-Wconversion" "-Werror=conversion" "-Wcast-align" "-Werror=cast-align")
-list (APPEND STRICT_OPTIONS_C "-std=c99")
+
 bc_apply_compile_flags(SOURCE_FILES_C STRICT_OPTIONS_CPP STRICT_OPTIONS_C)
 bc_apply_compile_flags(SOURCE_FILES_CXX STRICT_OPTIONS_CPP STRICT_OPTIONS_CXX)
 bc_apply_compile_flags(SOURCE_FILES_OBJC STRICT_OPTIONS_CPP STRICT_OPTIONS_OBJC)
diff --git a/tester/quality_reporting_tester.c b/tester/quality_reporting_tester.c
index ef00ace9d..1cd5ef8df 100644
--- a/tester/quality_reporting_tester.c
+++ b/tester/quality_reporting_tester.c
@@ -75,7 +75,6 @@ static const char *on_report_send_verify_metrics (const reporting_content_metric
 	return body;
 }
 
-#if VIDEO_ENABLED
 static void on_report_send_with_rtcp_xr_local (const LinphoneCall *call, SalStreamType stream_type, const LinphoneContent *content) {
 	char *remote_metrics_start = __strstr(linphone_content_get_string_buffer(content), "RemoteMetrics:");
 	reporting_session_report_t *report = linphone_quality_reporting_get_reports(linphone_call_log_get_quality_reporting(linphone_call_get_log(call)))[stream_type];
@@ -85,7 +84,6 @@ static void on_report_send_with_rtcp_xr_local (const LinphoneCall *call, SalStre
 	BC_ASSERT_PTR_NOT_NULL(body = __strstr(body, "LocalMetrics:"));
 	BC_ASSERT_TRUE(!remote_metrics_start || on_report_send_verify_metrics(&report->local_metrics, body) < remote_metrics_start);
 }
-#endif
 
 static void on_report_send_with_rtcp_xr_remote (const LinphoneCall *call, SalStreamType stream_type, const LinphoneContent *content) {
 	char *body = (char *)linphone_content_get_buffer(content);
diff --git a/wrappers/java/jni.mustache b/wrappers/java/jni.mustache
index 4da527dc2..549669a6f 100644
--- a/wrappers/java/jni.mustache
+++ b/wrappers/java/jni.mustache
@@ -69,6 +69,12 @@ static jlong GetObjectNativePtr(JNIEnv *env, jobject object) {
 	return nativePtr;
 }
 
+static void SetObjectNativePtr(JNIEnv *env, jobject object, jlong ptr) {
+	jclass objClass = env->GetObjectClass(object);
+	jfieldID nativePtrId = env->GetFieldID(objClass, "nativePtr", "J");
+	env->SetLongField(object, nativePtrId, ptr);
+}
+
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 void linphone_android_log_handler(int prio, char *str) {