diff --git a/roles/internetarchive/tasks/main.yml b/roles/internetarchive/tasks/main.yml
index 5bb2469c3..728eab2d6 100644
--- a/roles/internetarchive/tasks/main.yml
+++ b/roles/internetarchive/tasks/main.yml
@@ -7,10 +7,10 @@
 
 - name: Install packages needed by Distributed Web
   package:
-      name:
-         - libsecret-1-dev
-         - cmake
-      state: present
+    name:
+      - libsecret-1-dev
+      - cmake
+    state: present
 
 - name: Create directory {{ internetarchive_dir }}
   file:
@@ -22,7 +22,7 @@
   command: sudo yarn add @internetarchive/dweb-archive @internetarchive/dweb-mirror
   args:
     chdir: "{{ internetarchive_dir }}"
-  when: internet_available
+  when: internet_available | bool
 
 - name: Create directory /library/archiveorg
   file:
@@ -30,6 +30,7 @@
     state: directory
     owner: "root"
 
+
 # CONFIG FILES
 
 - name: "Install from templates: internetarchive.service (systemd), internetarchive.conf (Apache)"
@@ -43,7 +44,6 @@
     - { src: 'internetarchive.service.j2', dest: '/etc/systemd/system/internetarchive.service' }
     - { src: 'internetarchive.conf', dest: '/etc/apache2/sites-available/internetarchive.conf' }
 
-
 - name: Create symlink internetarchive.conf from sites-enabled to sites-available, for short URLs http://box/sugar & http://box/internetarchive (if internetarchive_enabled)
   file:
     src: /etc/apache2/sites-available/internetarchive.conf
@@ -67,8 +67,8 @@
     daemon_reload: yes
     enabled: yes
     state: restarted
-  when: internetarchive_enabled
-  
+  when: internetarchive_enabled | bool
+
 - name: Disable & Stop 'internetarchive' systemd service (if not internetarchive_enabled)
   systemd:
     name: internetarchive
@@ -81,7 +81,8 @@
   systemd:
     name: "{{ apache_service }}"    # httpd or apache2
     state: restarted
-  when: internetarchive_enabled
+  when: internetarchive_enabled | bool
+
 
 - name: Add 'internetarchive' variable values to {{ iiab_ini_file }}
   ini_file: