diff --git a/Netdisco/lib/App/Netdisco.pm b/Netdisco/lib/App/Netdisco.pm
index 42bbf08b..deec5691 100644
--- a/Netdisco/lib/App/Netdisco.pm
+++ b/Netdisco/lib/App/Netdisco.pm
@@ -5,8 +5,6 @@ use warnings;
 use 5.010_000;
 
 our $VERSION = '2.027003';
-
-use App::Netdisco::Environment;
 use App::Netdisco::DefaultSettings;
 
 =head1 NAME
diff --git a/Netdisco/lib/App/Netdisco/Daemon/JobQueue.pm b/Netdisco/lib/App/Netdisco/Daemon/JobQueue.pm
index db48aa05..7580f646 100644
--- a/Netdisco/lib/App/Netdisco/Daemon/JobQueue.pm
+++ b/Netdisco/lib/App/Netdisco/Daemon/JobQueue.pm
@@ -7,7 +7,7 @@ use namespace::clean;
 
 use Module::Load ();
 Module::Load::load_remote 'JobQueue' =>
-  'App::Netdisco::JobQueue::' . setting('job_queue') => ':all';
+  'App::Netdisco::JobQueue::' . setting('workers')->{queue} => ':all';
 
 sub jq_get      { shift and JobQueue::jq_get(@_) }
 sub jq_getlocal { shift and JobQueue::jq_getlocal(@_) }
diff --git a/Netdisco/lib/App/Netdisco/DefaultSettings.pm b/Netdisco/lib/App/Netdisco/DefaultSettings.pm
index 0af964f1..31f120b4 100644
--- a/Netdisco/lib/App/Netdisco/DefaultSettings.pm
+++ b/Netdisco/lib/App/Netdisco/DefaultSettings.pm
@@ -1,6 +1,7 @@
 package App::Netdisco::DefaultSettings;
 
-use Dancer qw/:moose :syntax :script/;
+use App::Netdisco::Environment;
+use Dancer ':script';
 
 # set up database schema config from simple config vars
 if (ref {} eq ref setting('database')) {
diff --git a/Netdisco/lib/App/Netdisco/JobQueue.pm b/Netdisco/lib/App/Netdisco/JobQueue.pm
index 3e947545..418c465c 100644
--- a/Netdisco/lib/App/Netdisco/JobQueue.pm
+++ b/Netdisco/lib/App/Netdisco/JobQueue.pm
@@ -4,7 +4,7 @@ use Dancer qw/:moose :syntax :script/;
 
 use Module::Load ();
 Module::Load::load
-  'App::Netdisco::JobQueue::' . setting('job_queue') => ':all';
+  'App::Netdisco::JobQueue::' . setting('workers')->{queue} => ':all';
 
 use base 'Exporter';
 our @EXPORT = ();