diff --git a/docker_watcher.v b/docker_watcher.v
index 602a6f3..205af55 100644
--- a/docker_watcher.v
+++ b/docker_watcher.v
@@ -5,7 +5,7 @@ $if linux || macos {
 	import net.unix
 	import os
 }
-import sources as _
+import sources
 
 fn (mut app App) docker_watch_loop() {
 	$if linux || macos {
diff --git a/server.v b/server.v
index bf4d952..b39ac3c 100644
--- a/server.v
+++ b/server.v
@@ -2,7 +2,7 @@ module main
 
 import net.http
 import time
-import json
+import x.json2 as json
 import crypto.hmac
 import crypto.sha256
 import encoding.hex
@@ -120,7 +120,8 @@ pub fn (mut app App) run() ! {
 
 $if linux || macos {
 	fn (mut app App) handle_signals() {
-		sigch := os.new_signal_channel(.int, .term, .hup)
+		mut sigch := chan os.Signal{cap: 10}
+		os.signal_opt(mut sigch, .int, .term, .hup) or { panic(err) }
 		for {
 			sig := <-sigch
 			match sig {