Cron jobs related issue fixes