fix TZ issues