Fixed time zone and date issues