diff --git a/roles/2-common/tasks/packages.yml b/roles/2-common/tasks/packages.yml
index 9331ea69a..fc2890816 100644
--- a/roles/2-common/tasks/packages.yml
+++ b/roles/2-common/tasks/packages.yml
@@ -33,7 +33,7 @@
     state: present
   when: is_debuntu | bool
 
-- name: "Install 23 common packages: acpid, bridge-utils, bzip2, curl, gawk, hostapd, htop, i2c-tools, logrotate, make, mlocate, netmask, net-tools, ntfs-3g, pandoc, pastebinit, rsync, sudo, tar, unzip, usbmount, usbutils, wget"
+- name: "Install 24 common packages: acpid, bridge-utils, bzip2, curl, gawk, hostapd, htop, i2c-tools, logrotate, make, mlocate, netmask, net-tools, ntfs-3g, pandoc, pastebinit, rsync, sqlite3,sudo, tar, unzip, usbmount, usbutils, wget"
   package:
     name:
       - acpid
@@ -56,6 +56,7 @@
       - pandoc
       - pastebinit
       - rsync
+      - sqlite3
       - sudo
       - tar
       - unzip
diff --git a/roles/network/tasks/hosts.yml.deprecated b/roles/network/tasks/hosts.yml.deprecated
index ce4a7467f..67898d350 100644
--- a/roles/network/tasks/hosts.yml.deprecated
+++ b/roles/network/tasks/hosts.yml.deprecated
@@ -16,6 +16,14 @@
     state: present
   when: not (iiab_lan_iface == "none") and not installing
 
+- name: Remove conflicting FQDN 127.0.0.1 in /etc/hosts placed by roles/0-init/tasks/hostname..yml/ L28
+  lineinfile:
+    path: /etc/hosts
+    regexp: '^127\.0\.0\.1'
+    line: '127.0.0.1     localhost.localdomain localhost'
+    state: present
+  when: not (iiab_lan_iface == "none") and not installing
+
 # roles/0-init/tasks/hostname.yml ALSO does this:
 - name: 'Put FQDN & hostnames in /etc/hosts: "127.0.0.1 {{ iiab_hostname }}.{{ iiab_domain }} localhost.localdomain localhost {{ iiab_hostname }} box box.lan" (if iiab_lan_iface == "none" and not installing, appliance mode?)'
   lineinfile:
diff --git a/roles/nginx/templates/nginx.conf b/roles/nginx/templates/nginx.conf
index d8c732b93..26937a067 100644
--- a/roles/nginx/templates/nginx.conf
+++ b/roles/nginx/templates/nginx.conf
@@ -22,9 +22,10 @@ http {
 	tcp_nodelay on;
 	keepalive_timeout 65;
 	types_hash_max_size 2048;
+
 	# server_tokens off;
 
-	# server_names_hash_bucket_size 64;
+	server_names_hash_bucket_size 64;
 	# server_name_in_redirect off;
 
 	include /etc/nginx/mime.types;
diff --git a/vars/default_vars.yml b/vars/default_vars.yml
index b04ed6eb6..13f9fbb9e 100644
--- a/vars/default_vars.yml
+++ b/vars/default_vars.yml
@@ -144,9 +144,9 @@ dns_jail_enabled: False
 # Python-based Captive Portal, that @m-anish & @jvonau experimented with in
 # July 2018 (https://github.com/iiab/iiab/pull/870) and that @georgejhunt
 # extensively refined later in 2018 (PRs #1179, #1300, #1327).
-captive_portal_install: False
-captive_portal_enabled: False
-captive_portal_port: 9090
+captiveportal_install: False
+captiveportal_enabled: False
+captiveportal_port: 9090
 # In a pinch, disable Captive Portal using instructions in http://FAQ.IIAB.IO
 
 # Bluetooth PAN access to IIAB server
diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml
index ef2b9f4e1..8a6178e1f 100644
--- a/vars/local_vars_big.yml
+++ b/vars/local_vars_big.yml
@@ -82,8 +82,8 @@ dns_jail_enabled: False
 # Python-based Captive Portal, that @m-anish & @jvonau experimented with in
 # July 2018 (https://github.com/iiab/iiab/pull/870) and that @georgejhunt
 # extensively refined later in 2018 (PRs #1179, #1300, #1327).
-captive_portal_install: False
-captive_portal_enabled: False
+captiveportal_install: False
+captiveportal_enabled: False
 # In a pinch, disable Captive Portal using instructions in http://FAQ.IIAB.IO
 
 # Bluetooth PAN access to IIAB server
diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml
index 4afe19d52..c64384b43 100644
--- a/vars/local_vars_medium.yml
+++ b/vars/local_vars_medium.yml
@@ -82,8 +82,8 @@ dns_jail_enabled: False
 # Python-based Captive Portal, that @m-anish & @jvonau experimented with in
 # July 2018 (https://github.com/iiab/iiab/pull/870) and that @georgejhunt
 # extensively refined later in 2018 (PRs #1179, #1300, #1327).
-captive_portal_install: False
-captive_portal_enabled: False
+captiveportal_install: False
+captiveportal_enabled: False
 # In a pinch, disable Captive Portal using instructions in http://FAQ.IIAB.IO
 
 # Bluetooth PAN access to IIAB server
diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml
index a92ce2e27..62b434f91 100644
--- a/vars/local_vars_min.yml
+++ b/vars/local_vars_min.yml
@@ -82,8 +82,8 @@ dns_jail_enabled: False
 # Python-based Captive Portal, that @m-anish & @jvonau experimented with in
 # July 2018 (https://github.com/iiab/iiab/pull/870) and that @georgejhunt
 # extensively refined later in 2018 (PRs #1179, #1300, #1327).
-captive_portal_install: False
-captive_portal_enabled: False
+captiveportal_install: False
+captiveportal_enabled: False
 # In a pinch, disable Captive Portal using instructions in http://FAQ.IIAB.IO
 
 # Bluetooth PAN access to IIAB server