diff --git a/avro/CMakeLists.txt b/avro/CMakeLists.txt
index cef0e2e05..f1b1f3e09 100644
--- a/avro/CMakeLists.txt
+++ b/avro/CMakeLists.txt
@@ -4,7 +4,7 @@ if (AVRO_FOUND AND JANSSON_FOUND)
   target_link_libraries(maxavro maxscale-common ${JANSSON_LIBRARIES})
 
   add_executable(maxavrocheck maxavrocheck.c)
-  target_link_libraries(maxavrocheck maxavro)
+  target_link_libraries(maxavrocheck maxavro maxscale-common)
   install_executable(maxavrocheck core)
   add_subdirectory(test)
 endif()
diff --git a/server/modules/routing/binlogrouter/test/testbinlog.cc b/server/modules/routing/binlogrouter/test/testbinlog.cc
index a48dfd68d..5e73fa173 100644
--- a/server/modules/routing/binlogrouter/test/testbinlog.cc
+++ b/server/modules/routing/binlogrouter/test/testbinlog.cc
@@ -511,7 +511,7 @@ int main(int argc, char** argv)
      * Expected rc is 0, if 1 test fails
      */
     strcpy(error_string, "");
-    memset(&change_master, 0, sizeof(change_master));
+    change_master = ChangeMasterOptions{};
     strcpy(query,
            "CHANGE MASTER TO MasTER_hoST =  '127.0.0.1', MASTER_PORT=9999, MASTER_PASSWORD='massi', MAster_user='eee', master_log_file=     'fffff', master_log_pos= 55"
            + command_offset);