diff --git a/lib/hooks/decimate.c b/lib/hooks/decimate.c
index 9659a54ff..2584d9652 100644
--- a/lib/hooks/decimate.c
+++ b/lib/hooks/decimate.c
@@ -82,13 +82,13 @@ static struct plugin p = {
 	.description	= "Downsamping by integer factor",
 	.type		= PLUGIN_TYPE_HOOK,
 	.hook		= {
-		.flags	= HOOK_NODE | HOOK_PATH,
-		.priority = 99,
-		.init	= decimate_init,
-		.parse	= decimate_parse,
-		.read	= decimate_read,
-		.process= decimate_read,
-		.size	= sizeof(struct decimate)
+		.flags		= HOOK_NODE | HOOK_PATH,
+		.priority	= 99,
+		.init		= decimate_init,
+		.parse		= decimate_parse,
+		.read		= decimate_read,
+		.process	= decimate_read,
+		.size		= sizeof(struct decimate)
 	}
 };
 
diff --git a/lib/hooks/drop.c b/lib/hooks/drop.c
index 70e63ff90..14033150e 100644
--- a/lib/hooks/drop.c
+++ b/lib/hooks/drop.c
@@ -119,13 +119,13 @@ static struct plugin p = {
 	.description	= "Drop messages with reordered sequence numbers",
 	.type		= PLUGIN_TYPE_HOOK,
 	.hook		= {
-		.flags	= HOOK_BUILTIN | HOOK_NODE,
-		.priority = 3,
-		.read	= drop_read,
-		.start	= drop_start,
-		.stop	= drop_stop,
-		.restart= drop_restart,
-		.size	= sizeof(struct drop)
+		.flags		= HOOK_BUILTIN | HOOK_NODE,
+		.priority	= 3,
+		.read		= drop_read,
+		.start		= drop_start,
+		.stop		= drop_stop,
+		.restart	= drop_restart,
+		.size		= sizeof(struct drop)
 	}
 };
 
diff --git a/lib/hooks/jitter_calc.c b/lib/hooks/jitter_calc.c
index 1e202b57d..771b036f6 100644
--- a/lib/hooks/jitter_calc.c
+++ b/lib/hooks/jitter_calc.c
@@ -130,12 +130,12 @@ static struct plugin p = {
 	.description	= "Calc jitter, mean and variance of GPS vs NTP TS",
 	.type		= PLUGIN_TYPE_HOOK,
 	.hook		= {
-		.flags	= HOOK_NODE,
-		.priority = 0,
-		.init	= jitter_calc_init,
-		.destroy= jitter_calc_deinit,
-		.read	= jitter_calc_read,
-		.size	= sizeof(struct jitter_calc)
+		.flags		= HOOK_NODE,
+		.priority	= 0,
+		.init		= jitter_calc_init,
+		.destroy	= jitter_calc_deinit,
+		.read		= jitter_calc_read,
+		.size		= sizeof(struct jitter_calc)
 	}
 };
 
diff --git a/lib/hooks/limit_rate.c b/lib/hooks/limit_rate.c
index ff177cc7a..d40842e97 100644
--- a/lib/hooks/limit_rate.c
+++ b/lib/hooks/limit_rate.c
@@ -126,14 +126,14 @@ static struct plugin p = {
 	.description	= "Limit sending rate",
 	.type		= PLUGIN_TYPE_HOOK,
 	.hook		= {
-		.flags	= HOOK_NODE | HOOK_PATH,
-		.priority = 99,
-		.init	= limit_rate_init,
-		.parse	= limit_rate_parse,
-		.read	= limit_rate_write,
-		.write	= limit_rate_write,
-		.process= limit_rate_write,
-		.size	= sizeof(struct limit_rate)
+		.flags		= HOOK_NODE | HOOK_PATH,
+		.priority	= 99,
+		.init		= limit_rate_init,
+		.parse		= limit_rate_parse,
+		.read		= limit_rate_write,
+		.write		= limit_rate_write,
+		.process	= limit_rate_write,
+		.size		= sizeof(struct limit_rate)
 	}
 };
 
diff --git a/lib/hooks/print.c b/lib/hooks/print.c
index ceae9037b..53b8862bd 100644
--- a/lib/hooks/print.c
+++ b/lib/hooks/print.c
@@ -174,17 +174,17 @@ static struct plugin p = {
 	.description	= "Print the message to stdout",
 	.type		= PLUGIN_TYPE_HOOK,
 	.hook		= {
-		.flags	= HOOK_NODE | HOOK_PATH,
-		.priority = 99,
-		.init	= print_init,
-		.parse	= print_parse,
-		.destroy= print_destroy,
-		.start	= print_start,
-		.stop	= print_stop,
-		.read   = print_read,
-		.write  = print_write,
-		.process= print_process,
-		.size	= sizeof(struct print)
+		.flags		= HOOK_NODE | HOOK_PATH,
+		.priority	= 99,
+		.init		= print_init,
+		.parse		= print_parse,
+		.destroy	= print_destroy,
+		.start		= print_start,
+		.stop		= print_stop,
+		.read   	= print_read,
+		.write  	= print_write,
+		.process	= print_process,
+		.size		= sizeof(struct print)
 	}
 };
 
diff --git a/lib/hooks/restart.c b/lib/hooks/restart.c
index 0aff2eb11..00cf0ce5d 100644
--- a/lib/hooks/restart.c
+++ b/lib/hooks/restart.c
@@ -104,12 +104,12 @@ static struct plugin p = {
 	.description	= "Call restart hooks for current node",
 	.type		= PLUGIN_TYPE_HOOK,
 	.hook		= {
-		.flags	= HOOK_NODE | HOOK_BUILTIN,
-		.priority = 1,
-		.read	= restart_read,
-		.start	= restart_start,
-		.stop	= restart_stop,
-		.size	= sizeof(struct restart)
+		.flags		= HOOK_NODE | HOOK_BUILTIN,
+		.priority 	= 1,
+		.read		= restart_read,
+		.start		= restart_start,
+		.stop		= restart_stop,
+		.size		= sizeof(struct restart)
 	}
 };
 
diff --git a/lib/hooks/scale.c b/lib/hooks/scale.c
index 76c44ec55..c17dbd4c3 100644
--- a/lib/hooks/scale.c
+++ b/lib/hooks/scale.c
@@ -88,12 +88,12 @@ static struct plugin p = {
 	.description	= "Scale all signals by and add offset",
 	.type		= PLUGIN_TYPE_HOOK,
 	.hook		= {
-		.flags	= HOOK_PATH,
-		.priority = 99,
-		.init	= scale_init,
-		.parse	= scale_parse,
-		.process= scale_process,
-		.size	= sizeof(struct scale)
+		.flags		= HOOK_PATH,
+		.priority	= 99,
+		.init		= scale_init,
+		.parse		= scale_parse,
+		.process	= scale_process,
+		.size		= sizeof(struct scale)
 	}
 };
 
diff --git a/lib/hooks/shift_seq.c b/lib/hooks/shift_seq.c
index 3414634b8..6d82d5459 100644
--- a/lib/hooks/shift_seq.c
+++ b/lib/hooks/shift_seq.c
@@ -63,11 +63,12 @@ static struct plugin p = {
 	.description	= "Shift sequence number of samples",
 	.type		= PLUGIN_TYPE_HOOK,
 	.hook		= {
-		.flags	= HOOK_NODE | HOOK_PATH,
-		.priority = 99,
-		.parse	= shift_seq_parse,
-		.read	= shift_seq_read,
-		.size	= sizeof(struct shift),
+		.flags		= HOOK_NODE | HOOK_PATH,
+		.priority	= 99,
+		.parse		= shift_seq_parse,
+		.read		= shift_seq_read,
+		.process	= shift_seq_read,
+		.size		= sizeof(struct shift),
 	}
 };
 
diff --git a/lib/hooks/shift_ts.c b/lib/hooks/shift_ts.c
index b9799da4b..a4683a7e1 100644
--- a/lib/hooks/shift_ts.c
+++ b/lib/hooks/shift_ts.c
@@ -102,12 +102,13 @@ static struct plugin p = {
 	.description	= "Shift timestamps of samples",
 	.type		= PLUGIN_TYPE_HOOK,
 	.hook		= {
-		.flags	= HOOK_NODE | HOOK_PATH,
-		.priority = 99,
-		.init	= shift_ts_init,
-		.parse	= shift_ts_parse,
-		.read	= shift_ts_read,
-		.size	= sizeof(struct shift_ts)
+		.flags		= HOOK_NODE | HOOK_PATH,
+		.priority 	= 99,
+		.init		= shift_ts_init,
+		.parse		= shift_ts_parse,
+		.read		= shift_ts_read,
+		.process	= shift_ts_read,
+		.size		= sizeof(struct shift_ts)
 	}
 };
 
diff --git a/lib/hooks/skip_first.c b/lib/hooks/skip_first.c
index 2ce0c462f..a6205a6b8 100644
--- a/lib/hooks/skip_first.c
+++ b/lib/hooks/skip_first.c
@@ -149,13 +149,14 @@ static struct plugin p = {
 	.description	= "Skip the first samples",
 	.type		= PLUGIN_TYPE_HOOK,
 	.hook		= {
-		.flags	= HOOK_NODE | HOOK_PATH,
-		.priority = 99,
-		.parse	= skip_first_parse,
-		.start	= skip_first_restart,
-		.restart = skip_first_restart,
-		.read	= skip_first_read,
-		.size	= sizeof(struct skip_first)
+		.flags		= HOOK_NODE | HOOK_PATH,
+		.priority	= 99,
+		.parse		= skip_first_parse,
+		.start		= skip_first_restart,
+		.restart	= skip_first_restart,
+		.read		= skip_first_read,
+		.process	= skip_first_read,
+		.size		= sizeof(struct skip_first)
 	}
 };
 
diff --git a/lib/hooks/stats.c b/lib/hooks/stats.c
index b3f5c87a8..0a2748056 100644
--- a/lib/hooks/stats.c
+++ b/lib/hooks/stats.c
@@ -209,18 +209,18 @@ static struct plugin p = {
 	.description	= "Collect statistics for the current path",
 	.type		= PLUGIN_TYPE_HOOK,
 	.hook		= {
-		.flags	= HOOK_NODE,
-		.priority = 2,
-		.init	= stats_collect_init,
-		.destroy= stats_collect_destroy,
-		.start	= stats_collect_start,
-		.stop	= stats_collect_stop,
-		.read	= stats_collect_read,
-		.write	= stats_collect_write,
-		.restart= stats_collect_restart,
-		.periodic= stats_collect_periodic,
-		.parse	= stats_collect_parse,
-		.size	= sizeof(struct stats_collect),
+		.flags		= HOOK_NODE,
+		.priority	= 2,
+		.init		= stats_collect_init,
+		.destroy	= stats_collect_destroy,
+		.start		= stats_collect_start,
+		.stop		= stats_collect_stop,
+		.read		= stats_collect_read,
+		.write		= stats_collect_write,
+		.restart	= stats_collect_restart,
+		.periodic	= stats_collect_periodic,
+		.parse		= stats_collect_parse,
+		.size		= sizeof(struct stats_collect),
 	}
 };
 
diff --git a/lib/hooks/ts.c b/lib/hooks/ts.c
index 83d75c97f..c52279bb2 100644
--- a/lib/hooks/ts.c
+++ b/lib/hooks/ts.c
@@ -42,10 +42,9 @@ static struct plugin p = {
 	.description	= "Overwrite origin timestamp of samples with receive timestamp",
 	.type		= PLUGIN_TYPE_HOOK,
 	.hook		= {
-		.flags	= HOOK_NODE,
-		.priority = 99,
-		.read	= ts_read,
-		.size	= 0
+		.flags		= HOOK_NODE,
+		.priority	= 99,
+		.read		= ts_read
 	}
 };