diff --git a/roles/calibre/tasks/debs.yml b/roles/calibre/tasks/debs.yml
index 81fd8cf16..8398eab71 100644
--- a/roles/calibre/tasks/debs.yml
+++ b/roles/calibre/tasks/debs.yml
@@ -46,7 +46,8 @@
 
 - name: Install/Upgrade to Calibre testing .deb's - target Ubuntu 16.04 (not rpi and not ubuntu_18)
   command: scripts/calibre-install-latest.sh
-  when: not is_rpi and not is_ubuntu_18 and internet_available
+  when: not is_rpi and (is_ubuntu_16 or is_debian_9) and internet_available
+  #when: not is_rpi and not is_ubuntu_18 and internet_available
 
 - name: Install/Upgrade to Calibre unstable .deb's IF calibre_unstable_debs
   command: scripts/calibre-install-unstable.sh
diff --git a/roles/httpd/tasks/main.yml b/roles/httpd/tasks/main.yml
index fe761e180..423841ce2 100644
--- a/roles/httpd/tasks/main.yml
+++ b/roles/httpd/tasks/main.yml
@@ -29,10 +29,11 @@
   when: is_debian and ansible_distribution_major_version == "8"
 
 # SQLite3 no longer included in another package
-- name: Install php{{ php_version }}-sqlite3 (debian-9 or ubuntu-18)
+- name: Install php{{ php_version }}-sqlite3 (debian-9+ or ubuntu-18+)
   package:
     name: "php{{ php_version }}-sqlite3"
-  when: (is_debian and ansible_distribution_major_version == "9") or is_ubuntu_18
+  when: (is_debian and not is_debian_8) or (is_ubuntu and not is_ubuntu_16)
+  #when: (is_debian and ansible_distribution_major_version == "9") or is_ubuntu_18
 
 - name: 'Install 4 packages: httpd, mod_authnz_external, php, php-curl (redhat)'
   package: