diff --git a/docker-compose.yml b/docker-compose.yml
index 588fe47..d2a7c5a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,7 +9,7 @@ database:
     - "/opt/docker/postgresql/dicts/en_us.dict:/usr/share/postgresql/9.4/tsearch_data/en_us.dict"
     - "/opt/docker/postgresql/dicts/en_us.affix:/usr/share/postgresql/9.4/tsearch_data/en_us.affix"
     - "/opt/docker/postgresql/dicts/zulip_english.stop:/usr/share/postgresql/9.4/tsearch_data/zulip_english.stop"
-memcache:
+memcached:
   image: "quay.io/sameersbn/memcached:latest"
   restart: always
 rabbitmq:
@@ -31,13 +31,13 @@ zulip:
     - "443:443"
   links:
     - database
-    - memcache
+    - memcached
     - rabbitmq
     - camo
     - redis
   environment:
     DB_HOST: "database"
-    MEMCACHED_HOST: "memcache"
+    MEMCACHED_HOST: "memcached"
     REDIS_HOST: "redis"
     RABBITMQ_HOST: "rabbitmq"
     ZULIP_USER_EMAIL: "example@example.com"
diff --git a/entrypoint.sh b/entrypoint.sh
index 925aa96..d8738c3 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -120,6 +120,24 @@ secretsSetup(){
     unset SECRET_KEY
 }
 zulipSetup(){
+    if [ ! -d "$DATA_DIR/certs" ]; then
+        echo "No certs given."
+        return 1
+    fi
+    if [ ! -e "/etc/ssl/private/zulip.key" ]; then
+        if [ ! -e "$DATA_DIR/certs/zulip.key" ]; then
+            echo "No zulip.key given in $DATA_DIR."
+            return 1
+        fi
+        ln -sfT "$DATA_DIR/certs/zulip.key" "/etc/ssl/private/zulip.key"
+    fi
+    if [ ! -e "/etc/ssl/certs/zulip.combined-chain.crt" ]; then
+        if [ ! -e "$DATA_DIR/certs/zulip.combined-chain.crt" ]; then
+            echo "No zulip.combined-chain.crt given in $DATA_DIR."
+            return 1
+        fi
+        ln -sfT "$DATA_DIR/certs/zulip.combined-chain.crt" "/etc/ssl/certs/zulip.combined-chain.crt"
+    fi
     cat >> "$ZULIP_ZPROJECT_SETTINGS" <<EOF
 CACHES = {
     'default': {
@@ -250,7 +268,10 @@ if [ ! -f "$DATA_DIR/.initiated" ]; then
     echo "Secrets generated and set."
     echo "Setting Zulip settings ..."
     # Setup zulip settings
-    zulipSetup
+    if ! zulipSetup; then
+        echo "Zulip setup failed."
+        exit 1
+    fi
     echo "Zulip settings setup done."
     echo "Setting up database settings and server ..."
     # setup database
diff --git a/includes/zulip-puppet/files/nginx/nginx.conf b/includes/zulip-puppet/files/nginx/nginx.conf
index 80af9ff..294e21f 100644
--- a/includes/zulip-puppet/files/nginx/nginx.conf
+++ b/includes/zulip-puppet/files/nginx/nginx.conf
@@ -1,5 +1,7 @@
 user zulip;
 
+daemon off;
+
 worker_processes auto;
 pid /var/run/nginx.pid;
 
diff --git a/includes/zulip-puppet/files/supervisor/conf.d/cron.conf b/includes/zulip-puppet/files/supervisor/conf.d/cron.conf
index 3554f76..88d3046 100644
--- a/includes/zulip-puppet/files/supervisor/conf.d/cron.conf
+++ b/includes/zulip-puppet/files/supervisor/conf.d/cron.conf
@@ -1,5 +1,5 @@
 [program:cron]
-command = /usr/sbin/cron -f
+command = /usr/sbin/cron -f -L 15
 stdout_events_enabled=true
 stderr_events_enabled=true
 autorestart = true
diff --git a/includes/zulip-puppet/files/supervisor/conf.d/nginx.conf b/includes/zulip-puppet/files/supervisor/conf.d/nginx.conf
index e1fd998..df66dab 100644
--- a/includes/zulip-puppet/files/supervisor/conf.d/nginx.conf
+++ b/includes/zulip-puppet/files/supervisor/conf.d/nginx.conf
@@ -1,4 +1,4 @@
-[program:cron]
+[program:nginx]
 command = /usr/sbin/nginx
 stdout_events_enabled=true
 stderr_events_enabled=true