diff --git a/server/Makefile.am b/server/Makefile.am
index cad56130..c98bf382 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -30,7 +30,7 @@ if WANT_C_UNIT_TESTS
     fwknopd_utests_LDFLAGS  = -lcunit $(GPGME_LIBS)
 
 if NFQ_CAPTURE
-    fwknopd_utests_LDFLAGS += -lnetfilter_queue
+    fwknopd_utests_LDFLAGS += -lnetfilter_queue -lnfnetlink
 else
 if !UDP_SERVER
     fwknopd_utests_LDFLAGS += -lpcap
@@ -40,7 +40,7 @@ endif
 endif
 
 if NFQ_CAPTURE
-    fwknopd_LDADD += -lnetfilter_queue
+    fwknopd_LDADD += -lnetfilter_queue -lnfnetlink
 else
 if !UDP_SERVER
     fwknopd_LDADD += -lpcap
diff --git a/server/config_init.c b/server/config_init.c
index 0af6c7cb..e7d4399f 100644
--- a/server/config_init.c
+++ b/server/config_init.c
@@ -905,13 +905,12 @@ validate_options(fko_srv_options_t *opts)
     /* Enable NFQ Capture
     */
     if(opts->config[CONF_ENABLE_NFQ_CAPTURE] == NULL)
-    {
-        if((strncasecmp(DEF_ENABLE_NFQ_CAPTURE, "Y", 1) == 0) &&
-                !opts->enable_nfq_capture)
-        {
-            opts->enable_nfq_capture = 1;
-        }
         set_config_entry(opts, CONF_ENABLE_NFQ_CAPTURE, DEF_ENABLE_NFQ_CAPTURE);
+
+    if((strncasecmp(opts->config[CONF_ENABLE_NFQ_CAPTURE], "Y", 1) == 0) &&
+            !opts->enable_nfq_capture)
+    {
+        opts->enable_nfq_capture = 1;
     }
 
     /* NFQ Interface
diff --git a/server/fw_util_firewalld.c b/server/fw_util_firewalld.c
index 3726d51a..69d673c4 100644
--- a/server/fw_util_firewalld.c
+++ b/server/fw_util_firewalld.c
@@ -709,7 +709,7 @@ delete_all_chains(const fko_srv_options_t * const opts)
 
             /* Delete the rule to direct traffic to the NFQ chain.
             */
-            snprintf(cmd_buf, CMD_BUFSIZE-1, "%s " IPT_DEL_RULE_ARGS,
+            snprintf(cmd_buf, CMD_BUFSIZE-1, "%s " FIREWD_DEL_RULE_ARGS,
                 fwc.fw_command,
                 opts->config[CONF_NFQ_TABLE],
                 "INPUT",
@@ -730,7 +730,7 @@ delete_all_chains(const fko_srv_options_t * const opts)
 
             /* Flush the NFQ chain
             */
-            snprintf(cmd_buf, CMD_BUFSIZE-1, "%s " IPT_FLUSH_CHAIN_ARGS,
+            snprintf(cmd_buf, CMD_BUFSIZE-1, "%s " FIREWD_FLUSH_CHAIN_ARGS,
                 fwc.fw_command,
                 opts->config[CONF_NFQ_TABLE],
                 opts->config[CONF_NFQ_CHAIN]
@@ -750,7 +750,7 @@ delete_all_chains(const fko_srv_options_t * const opts)
 
             /* Delete the NF_QUEUE chains and rules
             */
-            snprintf(cmd_buf, CMD_BUFSIZE-1, "%s " IPT_DEL_CHAIN_ARGS,
+            snprintf(cmd_buf, CMD_BUFSIZE-1, "%s " FIREWD_DEL_CHAIN_ARGS,
                 fwc.fw_command,
                 opts->config[CONF_NFQ_TABLE],
                 opts->config[CONF_NFQ_CHAIN]
@@ -827,6 +827,9 @@ static int
 create_fw_chains(const fko_srv_options_t * const opts)
 {
     int     i, got_err = 0;
+#if USE_LIBNETFILTER_QUEUE
+    int     res = 0;
+#endif
 
     for(i=0; i < NUM_FWKNOP_ACCESS_TYPES; i++)
     {
@@ -842,7 +845,7 @@ create_fw_chains(const fko_srv_options_t * const opts)
 
         /* Create the NF_QUEUE chains and rules
         */
-        snprintf(cmd_buf, CMD_BUFSIZE-1, "%s " IPT_NEW_CHAIN_ARGS,
+        snprintf(cmd_buf, CMD_BUFSIZE-1, "%s " FIREWD_NEW_CHAIN_ARGS,
             fwc.fw_command,
             opts->config[CONF_NFQ_TABLE],
             opts->config[CONF_NFQ_CHAIN]
@@ -865,7 +868,7 @@ create_fw_chains(const fko_srv_options_t * const opts)
 
         /* Create the rule to direct traffic to the NFQ chain.
         */
-        snprintf(cmd_buf, CMD_BUFSIZE-1, "%s " IPT_ADD_JUMP_RULE_ARGS,
+        snprintf(cmd_buf, CMD_BUFSIZE-1, "%s " FIREWD_ADD_JUMP_RULE_ARGS,
             fwc.fw_command,
             opts->config[CONF_NFQ_TABLE],
             "INPUT",