fix up timezone code