Fix time zone, and improve switching.