*7567* Fixes to time zone code