Fix future bug and add dates for EBs