diff --git a/src/ac/ac_main.c b/src/ac/ac_main.c
index e7ef34e0..3dba4c2e 100644
--- a/src/ac/ac_main.c
+++ b/src/ac/ac_main.c
@@ -162,7 +162,7 @@ int main (int argc, const char * argv[])
 
 	DBGX("Attention! %s","DBGX is ON!");
 
-	cw_register_actions_cipwap_ac(&capwap_actions);
+	cw_register_actions_capwap_ac(&capwap_actions);
 	cw_register_actions_capwap_80211_ac(&capwap_actions);
 	//cw_register_actions_capwap_80211_ac(&capwap_actions);
 
diff --git a/src/ac/wtpman.c b/src/ac/wtpman.c
index b8c4f459..a4be8d44 100644
--- a/src/ac/wtpman.c
+++ b/src/ac/wtpman.c
@@ -304,7 +304,7 @@ static int wtpman_join(void *arg, time_t timer)
 
 	struct conn * conn = wtpman->conn;
 
-conn->strict_capwap=0;
+conn->strict_capwap=1;
 conn->strict_hdr=1;
 conn->capwap_mode=CW_MODE_CIPWAP;
 
diff --git a/src/capwap/cwrmsg.h b/src/capwap/cwrmsg.h
index 0bbeffe5..58cb1d0a 100644
--- a/src/capwap/cwrmsg.h
+++ b/src/capwap/cwrmsg.h
@@ -1,6 +1,7 @@
 #ifndef __CWRMSG_H
 #define __CWRMSG_H
 
+/*
 struct cwrmsg{
 	int rid;
 	int wbid;
@@ -14,5 +15,6 @@ struct cwrmsg{
 //#endif
 
 };
+*/
 
 #endif