diff --git a/roles/kalite/tasks/install-f18.yml b/roles/kalite/tasks/install-f18.yml
index 72970df2..635b7db6 100644
--- a/roles/kalite/tasks/install-f18.yml
+++ b/roles/kalite/tasks/install-f18.yml
@@ -31,8 +31,8 @@
        dest={{ downloads_dir }}/ka-lite
        depth=1
        version="0.13.x"
-  ignore_errors: yes
-  when: not {{ use_cache }} and not {{ no_network }} and kalite.stat.exists is defined an not kalite.stat.exists
+#  ignore_errors: yes
+  when: not {{ use_cache }} and not {{ no_network }} and kalite.stat.exists is defined and not kalite.stat.exists
   tags:
     - download2
 
diff --git a/roles/mongodb/templates/mongodb.service b/roles/mongodb/templates/mongodb.service
index abea6c8c..313ae15c 100644
--- a/roles/mongodb/templates/mongodb.service
+++ b/roles/mongodb/templates/mongodb.service
@@ -8,7 +8,7 @@ User=mongodb
 Group=mongodb
 PIDFile=/var/run/mongodb/mongod.pid
 EnvironmentFile=/etc/sysconfig/mongodb 
-ExecStart=/usr/bin/mongod $OPTIONS run
+ExecStart=/usr/bin/mongod -f /etc/mongod.conf
  
 [Install]
 WantedBy=multi-user.target
diff --git a/roles/mysql/tasks/main.yml b/roles/mysql/tasks/main.yml
index 08a16bfa..04ce0d00 100644
--- a/roles/mysql/tasks/main.yml
+++ b/roles/mysql/tasks/main.yml
@@ -43,7 +43,7 @@
         - download
 
     - include: fedora.yml
-      when: ansible_distribution == "Fedora"
+      when: ansible_distribution == "Fedora" or ansible_distribution == "OLPC"
       tags:
         - download
 
diff --git a/roles/network/tasks/avahi.yml b/roles/network/tasks/avahi.yml
index 28b0cfe3..9a58a67d 100644
--- a/roles/network/tasks/avahi.yml
+++ b/roles/network/tasks/avahi.yml
@@ -44,11 +44,13 @@
   copy: src='/usr/share/doc/{{ avahi_ver.stdout }}/ssh.service'
         dest='/etc/avahi/services/'
   when: avahi_ver.stdout != "" and not is_debian
+  ignore_errors: True
 
 - name: Grab a clean copy of ssh.service
   copy: src='/usr/share/doc/avahi-daemon/examples/ssh.service'
         dest='/etc/avahi/services/'
   when: is_debian
+  ignore_errors: True
 
 - name: set ssh port for avahi
   lineinfile: dest=/etc/avahi/services/ssh.service
@@ -56,6 +58,7 @@
               line='    <port>{{ssh_port}}</port>'
               state=present
               backrefs=yes
+  ignore_errors: True
 
 - name: Enable avahi service
   service: name=avahi-daemon
diff --git a/vars/OLPC.yml b/vars/OLPC.yml
index de630873..1d83e856 100644
--- a/vars/OLPC.yml
+++ b/vars/OLPC.yml
@@ -16,3 +16,4 @@ systemctl_program: /usr/bin/systemctl
 mysql_service: mariadb
 apache_log: /var/log/httpd/access_log
 apache_log_dir: /var/log/httpd
+sshd_service: sshd