Better job of improving clock settings when changing viewers.