More fixes causing cron to fail