diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ce06e783b8bc15c1e6b8c30e2c7681b4ffdb9c3c..a34446ae45021d53c4c604353341edfe5f2fd84d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,7 +29,8 @@ stages:
   stage: build
   except:
     refs:
-      - master
+      - master@knot/knot-resolver
+      - master@knot/security/knot-resolver
     variables:
       - $SKIP_CI == "1"
   artifacts:
@@ -110,7 +111,8 @@ kres-gen:
   stage: test
   except:
     refs:
-      - master
+      - master@knot/knot-resolver
+      - master@knot/security/knot-resolver
     variables:
       - $SKIP_CI == "1"
   tags:
@@ -140,7 +142,8 @@ kres-gen:
   stage: test
   except:
     refs:
-      - master
+      - master@knot/knot-resolver
+      - master@knot/security/knot-resolver
     variables:
       - $SKIP_CI == "1"
   dependencies: []  # do not download build artifacts
@@ -149,18 +152,13 @@ kres-gen:
 
 build:darwin:
   <<: *test_nodep
-  except:
-    refs:
-      - master
-      - branches@knot/security/knot-resolver
-    variables:
-      - $SKIP_CI == "1"
-      - $SKIP_TRAVIS == "1"
   when: delayed
-  except:  # trigger job only in repos under our control
+  only:  # trigger job only in the main repo
+    refs:
+      - branches@knot/knot-resolver
+  except:
     refs:
-      - master
-      - branches@knot/security/knot-resolver
+      - master@knot/knot-resolver
     variables:
       - $SKIP_CI == "1"
   start_in: 3 minutes  # give the build in Travis CI time to finish
@@ -312,7 +310,8 @@ pytests:
     - branches@knot/security/knot-resolver
   except:
     refs:
-      - master
+      - master@knot/knot-resolver
+      - master@knot/security/knot-resolver
     variables:
       - $SKIP_CI == "1"
   script:
@@ -388,7 +387,8 @@ fwd-udp6-unbound.tls6:
     - branches@knot/security/knot-resolver
   except:
     refs:
-      - master
+      - master@knot/knot-resolver
+      - master@knot/security/knot-resolver
     variables:
       - $SKIP_CI == "1"
   script:
diff --git a/modules/http/http.lua.in b/modules/http/http.lua.in
index 7d022a448ec50226b9389b06eb9c713838dd5bcb..70048265f1cd617c24da51323f54b8c54c26c6f7 100644
--- a/modules/http/http.lua.in
+++ b/modules/http/http.lua.in
@@ -106,7 +106,7 @@ local function serve_root()
 	data = data
 	        :gsub('{{ title }}', M.title or ('kresd @ ' .. hostname()))
 	        :gsub('{{ host }}', hostname())
-	return function (_, stream)
+	return function (_, _)
 		-- Render snippets
 		local rsnippets = {}
 		for _,v in pairs(M.snippets) do