More changes to callisto_hourly_batch