diff --git a/cmake/plugins.cmake b/cmake/plugins.cmake
index 70baea43..385a6763 100644
--- a/cmake/plugins.cmake
+++ b/cmake/plugins.cmake
@@ -66,11 +66,11 @@ IF(CURL_FOUND)
 ENDIF()
 
 #Trace
-REGISTER_PLUGIN("TRACE_EXAMPLE" "${CC_SOURCE_DIR}/plugins/trace/trace_example.c" "trace_example_plugin" "DYNAMIC" "trace_example" 1)
+REGISTER_PLUGIN("TRACE_EXAMPLE" "${CC_SOURCE_DIR}/plugins/trace/trace_example.c" "trace_example_plugin" "OFF" "trace_example" 1)
 
 #Connection
-REGISTER_PLUGIN("REPLICATION" "${CC_SOURCE_DIR}/plugins/connection/replication.c" "connection_replication_plugin" "DYNAMIC" "replication" 1)
-REGISTER_PLUGIN("AURORA" "${CC_SOURCE_DIR}/plugins/connection/aurora.c" "connection_aurora_plugin" "DYNAMIC" "aurora"  1)
+REGISTER_PLUGIN("REPLICATION" "${CC_SOURCE_DIR}/plugins/connection/replication.c" "connection_replication_plugin" "OFF" "replication" 1)
+REGISTER_PLUGIN("AURORA" "${CC_SOURCE_DIR}/plugins/connection/aurora.c" "connection_aurora_plugin" "OFF" "aurora"  1)
 
 # Allow registration of additional plugins
 IF(PLUGIN_CONF_FILE)
diff --git a/plugins/auth/gssapi_client.c b/plugins/auth/gssapi_client.c
index 8b264c51..b86d7964 100644
--- a/plugins/auth/gssapi_client.c
+++ b/plugins/auth/gssapi_client.c
@@ -54,9 +54,10 @@ static void log_error(MYSQL *mysql, OM_uint32 major, OM_uint32 minor, const char
   }
 }
 
-int auth_client(char *principal_name, char *mech, MYSQL *mysql, MYSQL_PLUGIN_VIO *vio)
+int auth_client(char *principal_name, char *mech __attribute__((unused)),
+                MYSQL *mysql, MYSQL_PLUGIN_VIO *vio)
 {
-
+  gss_buffer_desc input= {0,0};
   int ret= CR_ERROR;
   OM_uint32 major= 0, minor= 0;
   gss_ctx_id_t ctxt= GSS_C_NO_CONTEXT;
@@ -76,7 +77,6 @@ int auth_client(char *principal_name, char *mech, MYSQL *mysql, MYSQL_PLUGIN_VIO
     }
   }
 
-  gss_buffer_desc input= {0,0};
   do
   {
     gss_buffer_desc output= {0,0};