Time Zone comments fix