Cron fixes for cleaner