Fixed: Daemon hangs on restart (i.e Dovecot/Jessie)
Small fixes