Fix the scheduler and date picker to work together