Fixes cronjob issues

Closes #1185
Closes #1197