Fix issues with dates being out of synch