diff --git a/flake.nix b/flake.nix
index 7b05c2d7..a027b5cb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -104,6 +104,7 @@
                 SetScalar
                 Starman
                 SysHostnameLong
+                TermSizeAny
                 TestMore
                 TextDiff
                 TextTable
diff --git a/hydra-module.nix b/hydra-module.nix
index 4fa2d63f..7d80c0d6 100644
--- a/hydra-module.nix
+++ b/hydra-module.nix
@@ -166,7 +166,7 @@ in
 
       buildMachinesFiles = mkOption {
         type = types.listOf types.path;
-        default = [ "/etc/nix/machines" ];
+        default = optional (config.nix.buildMachines != []) "/etc/nix/machines";
         example = [ "/etc/nix/machines" "/var/lib/hydra/provisioner/machines" ];
         description = "List of files containing build machines.";
       };
diff --git a/src/lib/Hydra/Controller/API.pm b/src/lib/Hydra/Controller/API.pm
index 45cecfea..8bb710e0 100644
--- a/src/lib/Hydra/Controller/API.pm
+++ b/src/lib/Hydra/Controller/API.pm
@@ -81,7 +81,14 @@ sub jobsetToHash {
         nrscheduled => $jobset->get_column("nrscheduled"),
         nrsucceeded => $jobset->get_column("nrsucceeded"),
         nrfailed => $jobset->get_column("nrfailed"),
-        nrtotal => $jobset->get_column("nrtotal")
+        nrtotal => $jobset->get_column("nrtotal"),
+        lastcheckedtime => $jobset->lastcheckedtime,
+        starttime => $jobset->starttime,
+        checkinterval => $jobset->checkinterval,
+        triggertime => $jobset->triggertime,
+        fetcherrormsg => $jobset->fetcherrormsg,
+        errortime => $jobset->errortime,
+        haserrormsg => $jobset->errormsg eq "" ? JSON::false : JSON::true
     };
 }
 
diff --git a/src/lib/Hydra/Schema/Builds.pm b/src/lib/Hydra/Schema/Builds.pm
index a4de7f55..35d9ab36 100644
--- a/src/lib/Hydra/Schema/Builds.pm
+++ b/src/lib/Hydra/Schema/Builds.pm
@@ -544,8 +544,8 @@ __PACKAGE__->many_to_many(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07049 @ 2019-05-10 22:30:12
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:YK8Fc+37UAcL0u6ziOc5xQ
+# Created by DBIx::Class::Schema::Loader v0.07049 @ 2019-08-19 16:12:37
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:VjYbAQwv4THW2VfWQ5ajYQ
 
 __PACKAGE__->has_many(
   "dependents",