diff --git a/configure.d/1_bd_part_count.conf b/configure.d/1_bd_part_count.conf
index 0986b23..edea2aa 100644
--- a/configure.d/1_bd_part_count.conf
+++ b/configure.d/1_bd_part_count.conf
@@ -9,10 +9,10 @@
 check() {
 	cur_name=$(basename $2)
 	config_file_path=$1
-	if compile_module $cur_name "struct gendisk *disk = NULL; struct xarray xa; xa = disk->part_tbl" "linux/genhd.h"
+	if compile_module $cur_name "struct gendisk *disk = NULL; struct xarray xa; xa = disk->part_tbl;" "linux/genhd.h"
 	then
 		echo $cur_name "1" >> $config_file_path
-	elif compile_module $cur_name "struct gendisk *disk = NULL; struct disk_part_tbl *ptbl; ptbl = disk->part_tbl" "linux/genhd.h"
+	elif compile_module $cur_name "struct gendisk *disk = NULL; struct disk_part_tbl *ptbl; ptbl = disk->part_tbl;" "linux/genhd.h"
 	then
 		echo $cur_name "2" >> $config_file_path
 	else
diff --git a/configure.d/1_bdev_lookup.conf b/configure.d/1_bdev_lookup.conf
index 6ee643a..1867e43 100644
--- a/configure.d/1_bdev_lookup.conf
+++ b/configure.d/1_bdev_lookup.conf
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright(c) 2012-2021 Intel Corporation
+# Copyright(c) 2012-2022 Intel Corporation
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
@@ -9,13 +9,13 @@
 check() {
 	cur_name=$(basename $2)
 	config_file_path=$1
-    if compile_module $cur_name "dev_t dev; lookup_bdev(\"some_path\", &dev)" "linux/blkdev.h"
+    if compile_module $cur_name "dev_t dev; lookup_bdev(\"some_path\", &dev);" "linux/blkdev.h"
     then
         echo $cur_name "1" >> $config_file_path
-    elif compile_module $cur_name "lookup_bdev(\"some_path\")" "linux/fs.h" "linux/blkdev.h"
+    elif compile_module $cur_name "lookup_bdev(\"some_path\");" "linux/fs.h" "linux/blkdev.h"
     then
         echo $cur_name "2" >> $config_file_path
-    elif compile_module $cur_name "lookup_bdev(\"some_path\", 0)" "linux/fs.h" "linux/blkdev.h"
+    elif compile_module $cur_name "lookup_bdev(\"some_path\", 0);" "linux/fs.h" "linux/blkdev.h"
     then
         echo $cur_name "3" >> $config_file_path
     else
diff --git a/configure.d/1_bio_clone.conf b/configure.d/1_bio_clone.conf
index edc9d72..d91e296 100644
--- a/configure.d/1_bio_clone.conf
+++ b/configure.d/1_bio_clone.conf
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright(c) 2012-2021 Intel Corporation
+# Copyright(c) 2012-2022 Intel Corporation
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
@@ -9,13 +9,13 @@
 check() {
 	cur_name=$(basename $2)
 	config_file_path=$1
-    if compile_module $cur_name "bio_clone(NULL, 0)" "linux/bio.h"
+    if compile_module $cur_name "bio_clone(NULL, 0);" "linux/bio.h"
     then
         echo $cur_name "1" >> $config_file_path
-    elif compile_module $cur_name "bio_clone_kmalloc(NULL, 0)" "linux/bio.h"
+    elif compile_module $cur_name "bio_clone_kmalloc(NULL, 0);" "linux/bio.h"
     then
         echo $cur_name "2" >> $config_file_path
-    elif compile_module $cur_name "bio_clone_fast(NULL, 0, NULL)" "linux/bio.h"
+    elif compile_module $cur_name "bio_clone_fast(NULL, 0, NULL);" "linux/bio.h"
     then
         echo $cur_name "3" >> $config_file_path
     else
diff --git a/configure.d/1_bio_dev.conf b/configure.d/1_bio_dev.conf
index 4d69a20..380de33 100644
--- a/configure.d/1_bio_dev.conf
+++ b/configure.d/1_bio_dev.conf
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright(c) 2012-2021 Intel Corporation
+# Copyright(c) 2012-2022 Intel Corporation
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
@@ -9,13 +9,13 @@
 check() {
     cur_name=$(basename $2)
     config_file_path=$1
-    if compile_module $cur_name "struct bio b = {}; bio_dev(&b); b.bi_bdev = NULL" "linux/bio.h" "linux/genhd.h"
+    if compile_module $cur_name "struct bio b = {}; bio_dev(&b); b.bi_bdev = NULL;" "linux/bio.h" "linux/genhd.h"
     then
 	echo $cur_name "1" >> $config_file_path
-    elif compile_module $cur_name "struct bio b = {}; bio_dev(&b); b.bi_disk = NULL" "linux/bio.h"
+    elif compile_module $cur_name "struct bio b = {}; bio_dev(&b); b.bi_disk = NULL;" "linux/bio.h"
     then
         echo $cur_name "2" >> $config_file_path
-    elif compile_module $cur_name "struct bio b; b.bi_bdev = NULL" "linux/bio.h"
+    elif compile_module $cur_name "struct bio b; b.bi_bdev = NULL;" "linux/bio.h"
     then
         echo $cur_name "3" >> $config_file_path
     else
diff --git a/configure.d/1_bio_discard.conf b/configure.d/1_bio_discard.conf
index 17267df..53a4b0f 100644
--- a/configure.d/1_bio_discard.conf
+++ b/configure.d/1_bio_discard.conf
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright(c) 2012-2021 Intel Corporation
+# Copyright(c) 2012-2022 Intel Corporation
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
@@ -9,16 +9,16 @@
 check() {
 	cur_name=$(basename $2)
 	config_file_path=$1
-	if compile_module $cur_name "bio_op(NULL)" "linux/bio.h"
+	if compile_module $cur_name "bio_op(NULL);" "linux/bio.h"
 	then
 		echo $cur_name "1" >> $config_file_path
-	elif compile_module $cur_name "REQ_OP_MASK" "linux/blk_types.h"
+	elif compile_module $cur_name "REQ_OP_MASK;" "linux/blk_types.h"
 	then
 		echo $cur_name "2" >> $config_file_path
-	elif compile_module $cur_name "REQ_OP_DISCARD" "linux/blk_types.h"
+	elif compile_module $cur_name "REQ_OP_DISCARD;" "linux/blk_types.h"
 	then
 		echo $cur_name "3" >> $config_file_path
-	elif compile_module $cur_name "REQ_DISCARD" "linux/blk_types.h"
+	elif compile_module $cur_name "REQ_DISCARD;" "linux/blk_types.h"
 	then
 		echo $cur_name "4" >> $config_file_path
 	else
diff --git a/configure.d/1_bio_err.conf b/configure.d/1_bio_err.conf
index 46202ed..e650073 100644
--- a/configure.d/1_bio_err.conf
+++ b/configure.d/1_bio_err.conf
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright(c) 2012-2021 Intel Corporation
+# Copyright(c) 2012-2022 Intel Corporation
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
@@ -9,13 +9,13 @@
 check() {
 	cur_name=$(basename $2)
 	config_file_path=$1
-	if compile_module $cur_name "struct bio b;b.bi_status" "linux/bio.h"
+	if compile_module $cur_name "struct bio b; b.bi_status;" "linux/bio.h"
 	then
 		echo $cur_name "1" >> $config_file_path
-	elif compile_module $cur_name "struct bio b;b.bi_error" "linux/bio.h"
+	elif compile_module $cur_name "struct bio b; b.bi_error;" "linux/bio.h"
 	then
 		echo $cur_name "2" >> $config_file_path
-	elif compile_module $cur_name "bio_endio(NULL, 0)" "linux/bio.h"
+	elif compile_module $cur_name "bio_endio(NULL, 0);" "linux/bio.h"
 	then
 		echo $cur_name "3" >> $config_file_path
 	else
diff --git a/configure.d/1_bio_flags.conf b/configure.d/1_bio_flags.conf
index e99a943..5330b24 100644
--- a/configure.d/1_bio_flags.conf
+++ b/configure.d/1_bio_flags.conf
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright(c) 2012-2021 Intel Corporation
+# Copyright(c) 2012-2022 Intel Corporation
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
@@ -9,10 +9,10 @@
 check() {
 	cur_name=$(basename $2)
 	config_file_path=$1
-	if compile_module $cur_name "struct bio b;b.bi_opf" "linux/bio.h"
+	if compile_module $cur_name "struct bio b; b.bi_opf;" "linux/bio.h"
 	then
 		echo $cur_name "1" >> $config_file_path
-	elif compile_module $cur_name "struct bio b;b.bi_rw" "linux/bio.h"
+	elif compile_module $cur_name "struct bio b; b.bi_rw;" "linux/bio.h"
 	then
 		echo $cur_name "2" >> $config_file_path
     else
diff --git a/configure.d/1_bio_iter.conf b/configure.d/1_bio_iter.conf
index 54a3332..de230ec 100644
--- a/configure.d/1_bio_iter.conf
+++ b/configure.d/1_bio_iter.conf
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright(c) 2012-2021 Intel Corporation
+# Copyright(c) 2012-2022 Intel Corporation
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
@@ -9,10 +9,10 @@
 check() {
 	cur_name=$(basename $2)
 	config_file_path=$1
-	if compile_module $cur_name "struct bio b;b.bi_iter.bi_size" "linux/bio.h"
+	if compile_module $cur_name "struct bio b; b.bi_iter.bi_size;" "linux/bio.h"
 	then
 		echo $cur_name "1" >> $config_file_path
-	elif compile_module $cur_name "struct bio b;b.bi_size" "linux/bio.h"
+	elif compile_module $cur_name "struct bio b; b.bi_size;" "linux/bio.h"
 	then
 		echo $cur_name "2" >> $config_file_path
     else
diff --git a/configure.d/1_blk_end_req.conf b/configure.d/1_blk_end_req.conf
index f955d54..367edf2 100644
--- a/configure.d/1_blk_end_req.conf
+++ b/configure.d/1_blk_end_req.conf
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright(c) 2012-2021 Intel Corporation
+# Copyright(c) 2012-2022 Intel Corporation
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
@@ -9,10 +9,10 @@
 check() {
 	cur_name=$(basename $2)
 	config_file_path=$1
-	if compile_module $cur_name "blk_mq_end_request(NULL, 0)" "linux/blk-mq.h"
+	if compile_module $cur_name "blk_mq_end_request(NULL, 0);" "linux/blk-mq.h"
 	then
 		echo $cur_name "1" >> $config_file_path
-	elif compile_module $cur_name "blk_end_request_all(NULL, 0)" "linux/blkdev.h"
+	elif compile_module $cur_name "blk_end_request_all(NULL, 0);" "linux/blkdev.h"
 	then
 		echo $cur_name "2" >> $config_file_path
 	else
diff --git a/configure.d/1_dentry.conf b/configure.d/1_dentry.conf
index 57f6240..45054c7 100644
--- a/configure.d/1_dentry.conf
+++ b/configure.d/1_dentry.conf
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright(c) 2012-2021 Intel Corporation
+# Copyright(c) 2012-2022 Intel Corporation
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
@@ -9,10 +9,10 @@
 check() {
 	cur_name=$(basename $2)
 	config_file_path=$1
-	if compile_module $cur_name "struct dentry dentry;dentry.d_u.d_alias" "linux/dcache.h"
+	if compile_module $cur_name "struct dentry dentry; dentry.d_u.d_alias;" "linux/dcache.h"
 	then
 		echo $cur_name "1" >> $config_file_path
-	elif compile_module $cur_name "struct dentry dentry;dentry.d_alias" "linux/dcache.h"
+	elif compile_module $cur_name "struct dentry dentry; dentry.d_alias;" "linux/dcache.h"
 	then
 		echo $cur_name "2" >> $config_file_path
     else
diff --git a/configure.d/1_flush_flag.conf b/configure.d/1_flush_flag.conf
index 497b8d6..3b50844 100644
--- a/configure.d/1_flush_flag.conf
+++ b/configure.d/1_flush_flag.conf
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright(c) 2012-2021 Intel Corporation
+# Copyright(c) 2012-2022 Intel Corporation
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
@@ -9,13 +9,13 @@
 check() {
 	cur_name=$(basename $2)
 	config_file_path=$1
-    if compile_module $cur_name "BIO_FLUSH" "linux/bio.h"
+    if compile_module $cur_name "BIO_FLUSH;" "linux/bio.h"
 	then
 		echo $cur_name "1" >> $config_file_path
-	elif compile_module $cur_name "REQ_FLUSH" "linux/blk_types.h"
+	elif compile_module $cur_name "REQ_FLUSH;" "linux/blk_types.h"
 	then
 		echo $cur_name "2" >> $config_file_path
-	elif compile_module $cur_name "REQ_PREFLUSH" "linux/blk_types.h"
+	elif compile_module $cur_name "REQ_PREFLUSH;" "linux/blk_types.h"
 	then
 		echo $cur_name "3" >> $config_file_path
     else
diff --git a/configure.d/1_global_page_state.conf b/configure.d/1_global_page_state.conf
index 8739c87..0d7de85 100644
--- a/configure.d/1_global_page_state.conf
+++ b/configure.d/1_global_page_state.conf
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright(c) 2012-2021 Intel Corporation
+# Copyright(c) 2012-2022 Intel Corporation
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
@@ -9,10 +9,10 @@
 check() {
     cur_name=$(basename $2)
     config_file_path=$1
-    if compile_module $cur_name "global_zone_page_state(1)" "linux/mm.h"
+    if compile_module $cur_name "global_zone_page_state(1);" "linux/mm.h"
     then
         echo $cur_name "1" >> $config_file_path
-    elif compile_module $cur_name "global_page_state(1)" "linux/mm.h"
+    elif compile_module $cur_name "global_page_state(1);" "linux/mm.h"
     then
         echo $cur_name "2" >> $config_file_path
     else
diff --git a/configure.d/1_hlist.conf b/configure.d/1_hlist.conf
index f6e8837..24a2d87 100644
--- a/configure.d/1_hlist.conf
+++ b/configure.d/1_hlist.conf
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright(c) 2012-2021 Intel Corporation
+# Copyright(c) 2012-2022 Intel Corporation
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
@@ -9,10 +9,10 @@
 check() {
 	cur_name=$(basename $2)
 	config_file_path=$1
-	if compile_module $cur_name "struct hlist_node list" "linux/types.h"
+	if compile_module $cur_name "struct hlist_node list;" "linux/types.h"
 	then
 		echo $cur_name "1" >> $config_file_path
-	elif compile_module $cur_name "struct list_head list" "linux/list.h"
+	elif compile_module $cur_name "struct list_head list;" "linux/list.h"
 	then
 		echo $cur_name "2" >> $config_file_path
     else
diff --git a/configure.d/1_inode.conf b/configure.d/1_inode.conf
index ed0dd1e..e119adb 100644
--- a/configure.d/1_inode.conf
+++ b/configure.d/1_inode.conf
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright(c) 2012-2021 Intel Corporation
+# Copyright(c) 2012-2022 Intel Corporation
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
@@ -9,10 +9,10 @@
 check() {
 	cur_name=$(basename $2)
 	config_file_path=$1
-	if compile_module $cur_name "struct file file;file.f_inode" "linux/fs.h"
+	if compile_module $cur_name "struct file file; file.f_inode;" "linux/fs.h"
 	then
 		echo $cur_name "1" >> $config_file_path
-	elif compile_module $cur_name "struct file file;file->f_dentry->d_inode" "linux/fs.h"
+	elif compile_module $cur_name "struct file file; file->f_dentry->d_inode;" "linux/fs.h"
 	then
 		echo $cur_name "2" >> $config_file_path
     else
diff --git a/configure.d/1_queue_limits.conf b/configure.d/1_queue_limits.conf
index b276645..de59a93 100644
--- a/configure.d/1_queue_limits.conf
+++ b/configure.d/1_queue_limits.conf
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright(c) 2012-2021 Intel Corporation
+# Copyright(c) 2012-2022 Intel Corporation
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
@@ -10,13 +10,13 @@
 check() {
 	cur_name=$(basename $2)
 	config_file_path=$1
-	if compile_module $cur_name "struct queue_limits q;q.limits_aux" "linux/blkdev.h"
+	if compile_module $cur_name "struct queue_limits q; q.limits_aux;" "linux/blkdev.h"
 	then
 		echo $cur_name "1" >> $config_file_path
-	elif compile_module $cur_name "struct queue_limits q;q.max_write_zeroes_sectors" "linux/blkdev.h"
+	elif compile_module $cur_name "struct queue_limits q; q.max_write_zeroes_sectors;" "linux/blkdev.h"
 	then
 		echo $cur_name "2" >> $config_file_path
-	elif compile_module $cur_name "struct queue_limits q;q.max_write_same_sectors" "linux/blkdev.h"
+	elif compile_module $cur_name "struct queue_limits q; q.max_write_same_sectors;" "linux/blkdev.h"
 	then
 		echo $cur_name "3" >> $config_file_path
     else
diff --git a/configure.d/1_submit_bio.conf b/configure.d/1_submit_bio.conf
index f3f07d3..54627bc 100644
--- a/configure.d/1_submit_bio.conf
+++ b/configure.d/1_submit_bio.conf
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright(c) 2012-2021 Intel Corporation
+# Copyright(c) 2012-2022 Intel Corporation
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
@@ -14,16 +14,16 @@
 check() {
 	cur_name=$(basename $2)
 	config_file_path=$1
-	if compile_module $cur_name "submit_bio(NULL)" "linux/bio.h"
+	if compile_module $cur_name "submit_bio(NULL);" "linux/bio.h"
 	then
         echo $cur_name "1" >> $config_file_path
-	elif compile_module $cur_name "submit_bio(NULL)" "linux/fs.h"
+	elif compile_module $cur_name "submit_bio(NULL);" "linux/fs.h"
 	then
         echo $cur_name "2" >> $config_file_path
-	elif compile_module $cur_name "void *t=submit_bio(0, NULL)" "linux/fs.h"
+	elif compile_module $cur_name "void *t=submit_bio(0, NULL);" "linux/fs.h"
 	then
         echo $cur_name "4" >> $config_file_path
-	elif compile_module $cur_name "submit_bio(0, NULL)" "linux/fs.h"
+	elif compile_module $cur_name "submit_bio(0, NULL);" "linux/fs.h"
 	then
         echo $cur_name "4" >> $config_file_path
     else
diff --git a/configure.d/1_write_flag.conf b/configure.d/1_write_flag.conf
index cd64f25..383ae91 100644
--- a/configure.d/1_write_flag.conf
+++ b/configure.d/1_write_flag.conf
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright(c) 2012-2021 Intel Corporation
+# Copyright(c) 2012-2022 Intel Corporation
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
@@ -9,10 +9,10 @@
 check() {
 	cur_name=$(basename $2)
 	config_file_path=$1
-	if compile_module $cur_name "WRITE" "linux/blk_types.h"
+	if compile_module $cur_name "WRITE;" "linux/blk_types.h"
 	then
         echo $cur_name "1" >> $config_file_path
-	elif compile_module $cur_name "REQ_WRITE" "linux/blk_types.h"
+	elif compile_module $cur_name "REQ_WRITE;" "linux/blk_types.h"
 	then
         echo $cur_name "2" >> $config_file_path
     else
diff --git a/configure.d/2_bio_barrier.conf b/configure.d/2_bio_barrier.conf
index cf01ae5..c800ec1 100644
--- a/configure.d/2_bio_barrier.conf
+++ b/configure.d/2_bio_barrier.conf
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright(c) 2012-2021 Intel Corporation
+# Copyright(c) 2012-2022 Intel Corporation
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
@@ -9,13 +9,13 @@
 check() {
 	cur_name=$(basename $2)
 	config_file_path=$1
-	if compile_module $cur_name "RQF_SOFTBARRIER" "linux/blkdev.h"
+	if compile_module $cur_name "RQF_SOFTBARRIER;" "linux/blkdev.h"
 	then
         echo $cur_name "1" >> $config_file_path
-	elif compile_module $cur_name "REQ_SOFTBARRIER" "linux/blk_types.h"
+	elif compile_module $cur_name "REQ_SOFTBARRIER;" "linux/blk_types.h"
 	then
         echo $cur_name "2" >> $config_file_path
-	elif compile_module $cur_name "BIO_RW_BARRIER" "linux/fs.h"
+	elif compile_module $cur_name "BIO_RW_BARRIER;" "linux/fs.h"
 	then
         echo $cur_name "3" >> $config_file_path
     else
diff --git a/configure.d/2_bio_cmpl.conf b/configure.d/2_bio_cmpl.conf
index 7523ea9..d847070 100644
--- a/configure.d/2_bio_cmpl.conf
+++ b/configure.d/2_bio_cmpl.conf
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright(c) 2012-2021 Intel Corporation
+# Copyright(c) 2012-2022 Intel Corporation
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
@@ -9,10 +9,10 @@
 check() {
 	cur_name=$(basename $2)
 	config_file_path=$1
-	if compile_module $cur_name "struct bio b;b.bi_end_io(NULL, 0)" "linux/bio.h"
+	if compile_module $cur_name "struct bio b; b.bi_end_io(NULL, 0);" "linux/bio.h"
 	then
 		echo $cur_name "1" >> $config_file_path
-	elif compile_module $cur_name "struct bio b;b.bi_end_io(NULL)" "linux/bio.h"
+	elif compile_module $cur_name "struct bio b; b.bi_end_io(NULL);" "linux/bio.h"
 	then
 		echo $cur_name "2" >> $config_file_path
 	else
diff --git a/configure.d/2_generic_acct.conf b/configure.d/2_generic_acct.conf
index b567d8a..f5ecfee 100644
--- a/configure.d/2_generic_acct.conf
+++ b/configure.d/2_generic_acct.conf
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright(c) 2012-2021 Intel Corporation
+# Copyright(c) 2012-2022 Intel Corporation
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
@@ -9,19 +9,19 @@
 check() {
 	cur_name=$(basename $2)
 	config_file_path=$1
-	if compile_module $cur_name "bio_start_io_acct(NULL)" "linux/blkdev.h"
+	if compile_module $cur_name "bio_start_io_acct(NULL);" "linux/blkdev.h"
 	then
         echo $cur_name "1" >> $config_file_path
-	elif compile_module $cur_name "generic_start_io_acct(NULL, 0, 0, NULL)" "linux/bio.h"
+	elif compile_module $cur_name "generic_start_io_acct(NULL, 0, 0, NULL);" "linux/bio.h"
 	then
         echo $cur_name "2" >> $config_file_path
-	elif compile_module $cur_name "generic_start_io_acct(0, 0, NULL)" "linux/bio.h"
+	elif compile_module $cur_name "generic_start_io_acct(0, 0, NULL);" "linux/bio.h"
 	then
         echo $cur_name "3" >> $config_file_path
-	elif compile_module $cur_name "part_round_stats(1, 1)" "linux/genhd.h"
+	elif compile_module $cur_name "part_round_stats(1, 1);" "linux/genhd.h"
 	then
         echo $cur_name "4" >> $config_file_path
-	elif compile_module $cur_name "part_round_stats(NULL, 1, 1)" "linux/genhd.h"
+	elif compile_module $cur_name "part_round_stats(NULL, 1, 1);" "linux/genhd.h"
 	then
         echo $cur_name "5" >> $config_file_path
     else
diff --git a/configure.d/2_queue_write.conf b/configure.d/2_queue_write.conf
index 9a91e1f..6d17998 100644
--- a/configure.d/2_queue_write.conf
+++ b/configure.d/2_queue_write.conf
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright(c) 2012-2021 Intel Corporation
+# Copyright(c) 2012-2022 Intel Corporation
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
@@ -9,10 +9,10 @@
 check() {
 	cur_name=$(basename $2)
 	config_file_path=$1
-	if compile_module $cur_name "blk_queue_write_cache(NULL, 0, 0)" "linux/blkdev.h"
+	if compile_module $cur_name "blk_queue_write_cache(NULL, 0, 0);" "linux/blkdev.h"
 	then
 		echo $cur_name "1" >> $config_file_path
-	elif compile_module $cur_name "struct request_queue rq;rq.flush_flags" "linux/blkdev.h"
+	elif compile_module $cur_name "struct request_queue rq; rq.flush_flags;" "linux/blkdev.h"
 	then
 		echo $cur_name "2" >> $config_file_path
     else
diff --git a/configure.d/conf_framework b/configure.d/conf_framework
index b1a6000..8a98369 100644
--- a/configure.d/conf_framework
+++ b/configure.d/conf_framework
@@ -48,7 +48,7 @@ compile_module(){
 	$INCLUDE
 
 	int init_module(void) {
-		$2;
+		$2
 		return 0;
 	}
 	void cleanup_module(void) {};