Small tweaks to time zone handling.