Fix issues with date/timezone differences