diff --git a/packages/mcl/src/src/mcl/commands/ci.d b/packages/mcl/src/src/mcl/commands/ci.d
index 61d12588..72383894 100644
--- a/packages/mcl/src/src/mcl/commands/ci.d
+++ b/packages/mcl/src/src/mcl/commands/ci.d
@@ -25,7 +25,6 @@ export void ci(string[] args)
     auto shardMatrix = generateShardMatrix();
     foreach (shard; shardMatrix.include)
     {
-        writeln("Shard ", shard.prefix ~ " ", shard.postfix ~ " ", shard.digit);
         params.flakePre = shard.prefix;
         params.flakePost = shard.postfix;
 
@@ -33,10 +32,6 @@ export void ci(string[] args)
         {
             params.flakePre = "checks";
         }
-        if (params.flakePost != "")
-        {
-            params.flakePost = "." ~ params.flakePost;
-        }
         string cachixUrl = "https://" ~ params.cachixCache ~ ".cachix.org";
         version (AArch64) {
             string arch = "aarch64";
@@ -57,25 +52,20 @@ export void ci(string[] args)
 
         foreach (pkg; matrix)
         {
-            if (pkg.isCached)
-            {
-                writeln("Package ", pkg.name, " is cached");
-            }
-            else
-            {
-                writeln("Package ", pkg.name, " is not cached; building...");
-                ProcessPipes res = execute!ProcessPipes(["nix", "build", "--json", ".#" ~ pkg.attrPath]);
+            if (pkg.isCached) continue;
+
+            writeln("Package ", pkg.name, " is not cached; building...");
+            ProcessPipes res = execute!ProcessPipes(["nix", "build", "--json", ".#" ~ pkg.attrPath]);
 
-                foreach (line; res.stderr.byLine)
-                {
-                    "\r".write;
-                    line.write;
-                }
-                "".writeln;
-                auto json = parseJSON(res.stdout.byLine.join("\n").to!string);
-                auto path = json.array[0]["outputs"]["out"].str;
-                execute(["cachix", "push", params.cachixCache, path], false, true).writeln;
+            foreach (line; res.stderr.byLine)
+            {
+                "\r".write;
+                line.write;
             }
+            "".writeln;
+            auto json = parseJSON(res.stdout.byLine.join("\n").to!string);
+            auto path = json.array[0]["outputs"]["out"].str;
+            execute(["cachix", "push", params.cachixCache, path], false, true).writeln;
         }
 
     }
diff --git a/packages/mcl/src/src/mcl/commands/ci_matrix.d b/packages/mcl/src/src/mcl/commands/ci_matrix.d
index b8984b37..91d262fb 100755
--- a/packages/mcl/src/src/mcl/commands/ci_matrix.d
+++ b/packages/mcl/src/src/mcl/commands/ci_matrix.d
@@ -2,7 +2,7 @@ module mcl.commands.ci_matrix;
 
 import std.stdio : writeln, stderr, stdout;
 import std.traits : EnumMembers;
-import std.string : indexOf, splitLines;
+import std.string : indexOf, splitLines, strip;
 import std.algorithm : map, filter, reduce, chunkBy, find, any, sort, startsWith, each, canFind, fold;
 import std.file : write, readText;
 import std.range : array, front, join, split;
@@ -378,7 +378,8 @@ Package[] nixEvalJobs(string flakeAttrPrefix, string cachixUrl, bool doCheck = t
         .filter!(line => !uselessWarnings.any!(w => line.canFind(w)))
         .join("\n");
 
-    logWarning(stderrLogs);
+    if (stderrLogs.strip != "")
+        logWarning(stderrLogs);
 
     int status = wait(pipes.pid);
 
diff --git a/packages/secret/default.nix b/packages/secret/default.nix
index 2a840e64..c18aba9b 100644
--- a/packages/secret/default.nix
+++ b/packages/secret/default.nix
@@ -90,7 +90,8 @@ pkgs.writeShellApplication {
         secretsFolder="$machineFolder/secrets/$service"
         echo "Re-encripting secrets for service $s"
         if [ "$vm" == true ]; then
-          RULES="$(nix eval --raw ".#nixosConfigurations.$machine.config.virtualisation.vmVariant.mcl.secrets.services.$service.nix-file")"
+          RULES="$(nix eval --raw ".#nixosConfigurations.''${machine}-vm.config.mcl.secrets.services.$service.nix-file")"
+
         else
           RULES="$(nix eval --raw ".#nixosConfigurations.$machine.config.mcl.secrets.services.$service.nix-file")"
         fi